From 84cb9cf5e243d223222aa7fa58600d0f4b762b52 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 18 Jun 2009 10:36:22 +0000
Subject: [PATCH] - Patch #480282 by quicksketch: keep the 'add new comment'
 link.

---
 modules/comment/comment.module | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 3e6fb15eb5f..657e072545b 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -471,18 +471,21 @@ function comment_node_view($node, $teaser) {
       }
     }
     else {
-      // Node page: add a "post comment" link if the user is allowed to post comments,
-      // if this node is not read-only, and if the comment form isn't already shown.
+      // Node page: add a "post comment" link if the user is allowed to post
+      // comments and if this node is not read-only.
       if ($node->comment == COMMENT_NODE_OPEN) {
         if (user_access('post comments')) {
+          $links['comment_add'] = array(
+            'title' => t('Add new comment'),
+            'attributes' => array('title' => t('Share your thoughts and opinions related to this posting.')),
+            'fragment' => 'comment-form',
+            'html' => TRUE,
+          );
           if (variable_get('comment_form_location_' . $node->type, COMMENT_FORM_SEPARATE_PAGE) == COMMENT_FORM_SEPARATE_PAGE) {
-            $links['comment_add'] = array(
-              'title' => t('Add new comment'),
-              'href' => "comment/reply/$node->nid",
-              'attributes' => array('title' => t('Share your thoughts and opinions related to this posting.')),
-              'fragment' => 'comment-form',
-              'html' => TRUE,
-            );
+            $links['comment_add']['href'] = "comment/reply/$node->nid";
+          }
+          else {
+            $links['comment_add']['href'] = "node/$node->nid";
           }
         }
         else {