From 071d4b010e4e4a67db0231cf94c5eb2a627d1514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= Date: Wed, 3 Oct 2007 17:59:50 +0000 Subject: [PATCH] #180559 by hunmonk: do not try to display the comment addition form at th end of comments, if we are already on the page, so it is displayed anyway --- modules/comment/comment.module | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/comment/comment.module b/modules/comment/comment.module index 94d77379856..e95faf36549 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -1120,8 +1120,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')); }