? files
? misc/mc_blocks.js
? sites/localhost
? sites/localhost.drupal.dotest
? sites/localhost.drupal.project
? sites/all/modules
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.520.2.6
diff -u -F^f -r1.520.2.6 comment.module
--- modules/comment/comment.module	26 Jul 2007 19:16:45 -0000	1.520.2.6
+++ modules/comment/comment.module	3 Oct 2007 17:11:22 -0000
@@ -1055,8 +1055,9 @@ function comment_render($node, $cid = 0)
       }
     }
 
-    // If enabled, show new comment form.
-    if (user_access('post comments') && node_comment_mode($nid) == COMMENT_NODE_READ_WRITE && (variable_get('comment_form_location', COMMENT_FORM_SEPARATE_PAGE) == COMMENT_FORM_BELOW)) {
+    // If enabled, show new comment form if it's not already being displayed.
+    $reply = arg(0) == 'comment' && arg(1) == 'reply';
+    if (user_access('post comments') && node_comment_mode($nid) == COMMENT_NODE_READ_WRITE && (variable_get('comment_form_location', COMMENT_FORM_SEPARATE_PAGE) == COMMENT_FORM_BELOW) && !$reply) {
       $output .= comment_form_box(array('nid' => $nid), t('Post new comment'));
     }