From 033f2f3fdc1a9fd0f2f2b76156e9ac54e1a0d2ed Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 28 May 2009 08:37:29 +0000
Subject: - Patch #335893 by andypost, hexmode: don't show comment information
 in the RSS feed when a node's comments were disabled.

---
 modules/comment/comment.module | 12 +++++++-----
 modules/comment/comment.test   |  7 +++++++
 2 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'modules')

diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index ac2a38034..ae67b5d94 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -420,11 +420,13 @@ function comment_node_view($node, $teaser) {
 
   if ($node->comment) {
     if ($node->build_mode == NODE_BUILD_RSS) {
-      // Add a comments RSS element which is a URL to the comments of this node.
-      $node->rss_elements[] = array(
-        'key' => 'comments',
-        'value' => url('node/' . $node->nid, array('fragment' => 'comments', 'absolute' => TRUE))
-      );
+      if ($node->comment != COMMENT_NODE_HIDDEN) {
+        // Add a comments RSS element which is a URL to the comments of this node.
+        $node->rss_elements[] = array(
+          'key' => 'comments',
+          'value' => url('node/' . $node->nid, array('fragment' => 'comments', 'absolute' => TRUE))
+        );
+      }
     }
     else if ($teaser) {
       // Main page: display the number of comments that have been posted.
diff --git a/modules/comment/comment.test b/modules/comment/comment.test
index abe6b4ae6..b7c6abb0d 100644
--- a/modules/comment/comment.test
+++ b/modules/comment/comment.test
@@ -618,10 +618,17 @@ class CommentRSSUnitTest extends CommentHelperCase {
    * Test comments as part of an RSS feed.
    */
   function testCommentRSS() {
+    // Find comment in RSS feed.
     $this->drupalLogin($this->web_user);
     $comment = $this->postComment($this->node, $this->randomName(), $this->randomName());
     $this->drupalGet('rss.xml');
     $raw = '<comments>' . url('node/' . $this->node->nid, array('fragment' => 'comments', 'absolute' => TRUE)) . '</comments>';
     $this->assertRaw($raw, t('Comments as part of RSS feed.'));
+
+    // Hide comments from RSS feed and check presence.
+    $this->node->comment = COMMENT_NODE_HIDDEN;
+    node_save($this->node);
+    $this->drupalGet('rss.xml');
+    $this->assertNoRaw($raw, t('Hidden comments is not a part of RSS feed.'));
   }
 }
-- 
cgit v1.2.3