Changeset 35506

Timestamp:

11/04/2015 05:46:41 PM (9 years ago)

Author:

wonderboymusic

Message:

Feeds: <comments> is optional in RSS2, so don't include it when comments aren't present or open. Same for <wfw:commentRss> and <slash:comments>

Adds unit test.

Props swissspidy, realloc, hakre, sivel.
Fixes #9134.

Location:

trunk

Files:

• src/wp-includes/feed-atom.php (modified) (1 diff)
• src/wp-includes/feed-rss2.php (modified) (2 diffs)
• tests/phpunit/tests/feed/rss2.php (modified) (2 diffs)

trunk/src/wp-includes/feed-atom.php

@@ -79 +79 @@
      */
     do_action( 'atom_entry' );
+
+    if ( get_comments_number() || comments_open() ) :
         ?>
         <link rel="replies" type="<?php bloginfo_rss('html_type'); ?>" href="<?php the_permalink_rss() ?>#comments" thr:count="<?php echo get_comments_number()?>"/>
         <link rel="replies" type="application/atom+xml" href="<?php echo esc_url( get_post_comments_feed_link(0, 'atom') ); ?>" thr:count="<?php echo get_comments_number()?>"/>
         <thr:total><?php echo get_comments_number()?></thr:total>
+    <?php endif; ?>
     </entry>
     <?php endwhile ; ?>

trunk/src/wp-includes/feed-rss2.php

@@ -84 +84 @@
         <title><?php the_title_rss() ?></title>
         <link><?php the_permalink_rss() ?></link>
+<?php if ( get_comments_number() || comments_open() ) : ?>
         <comments><?php comments_link_feed(); ?></comments>
+<?php endif; ?>
         <pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_post_time('Y-m-d H:i:s', true), false); ?></pubDate>
         <dc:creator><![CDATA[<?php the_author() ?>]]></dc:creator>
@@ -101 +103 @@
     <?php endif; ?>
 <?php endif; ?>
+<?php if ( get_comments_number() || comments_open() ) : ?>
         <wfw:commentRss><?php echo esc_url( get_post_comments_feed_link(null, 'rss2') ); ?></wfw:commentRss>
         <slash:comments><?php echo get_comments_number(); ?></slash:comments>
+<?php endif; ?>
 <?php rss_enclosure(); ?>
     <?php

trunk/tests/phpunit/tests/feed/rss2.php

@@ -103 +103 @@
 
         // get all the rss -> channel -> item elements
-        $items = xml_find($xml, 'rss', 'channel', 'item');
-        $posts = get_posts('numberposts='.$this->post_count);
+        $items = xml_find( $xml, 'rss', 'channel', 'item' );
 
         // check each of the items against the known post data
@@ -179 +178 @@
         }
     }
+
+    /**
+     * @ticket 9134
+     */
+    function test_items_comments_closed() {
+        add_filter( 'comments_open', '__return_false' );
+
+        $this->go_to( '/?feed=rss2' );
+        $feed = $this->do_rss2();
+        $xml = xml_to_array($feed);
+
+        // get all the rss -> channel -> item elements
+        $items = xml_find( $xml, 'rss', 'channel', 'item' );
+
+        // check each of the items against the known post data
+        foreach ( $items as $key => $item ) {
+            // Get post for comparison
+            $guid = xml_find( $items[$key]['child'], 'guid' );
+            preg_match( '/\?p=(\d+)/', $guid[0]['content'], $matches );
+            $post = get_post( $matches[1] );
+
+            // comment link
+            $comments_link = xml_find( $items[ $key ]['child'], 'comments' );
+            $this->assertEmpty( $comments_link );
+
+            // comment rss
+            $comment_rss = xml_find( $items[ $key ]['child'], 'wfw:commentRss' );
+            $this->assertEmpty( $comment_rss );
+        }
+
+        remove_filter( 'comments_open', '__return_false' );
+    }
 }