- Patch #339929 by Moshe et al: move node links into ->content.

1 files changed, 20 insertions, 13 deletions

diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 96fd3680b..eb088a95e 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -412,16 +412,16 @@ function theme_comment_block() {
 }
 
 /**
- * Implementation of hook_link().
+ * An implementation of hook_nodeapi_view().
  */
-function comment_link($type, $node = NULL, $teaser = FALSE) {
+function comment_nodeapi_view($node, $teaser, $page) {
   $links = array();
 
-  if ($type == 'node' && $node->comment) {
+  if ($node->comment) {
     if ($teaser) {
       // Main page: display the number of comments that have been posted.
       if (user_access('access comments')) {
-        if ($node->comment_count) {
+        if (!empty($node->comment_count)) {
           $links['comment_comments'] = array(
             'title' => format_plural($node->comment_count, '1 comment', '@count comments'),
             'href' => "node/$node->nid",
@@ -476,17 +476,16 @@ function comment_link($type, $node = NULL, $teaser = FALSE) {
         }
       }
     }
-  }
-
-  if ($type == 'comment') {
-    $links = comment_links($node, $teaser);
-  }
+    
+    if (isset($links['comment_forbidden'])) {
+      $links['comment_forbidden']['html'] = TRUE;
+    }
 
-  if (isset($links['comment_forbidden'])) {
-    $links['comment_forbidden']['html'] = TRUE;
+    $node->content['links']['comment'] = array(
+      '#type' => 'node_links',
+      '#value' => $links,
+    );
   }
-
-  return $links;
 }
 
 /**
@@ -864,6 +863,14 @@ function comment_save($edit) {
   }
 }
 
+// An implementation of hook_link().
+function comment_link($type, $object, $teaser) {
+  if ($type == 'comment') {
+    $links = comment_links($object, FALSE);
+    return $links;
+  }
+}
+
 /**
  * Build command links for a comment (e.g.\ edit, reply, delete) with respect to the current user's access permissions.
  *