<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[35506] trunk: Feeds: `<comments>` is optional in RSS2, so don't include it when comments aren't present or open.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/35506">35506</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/35506","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-11-04 17:46:41 +0000 (Wed, 04 Nov 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/ticket/9134">#9134</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesfeedatomphp">trunk/src/wp-includes/feed-atom.php</a></li>
<li><a href="#trunksrcwpincludesfeedrss2php">trunk/src/wp-includes/feed-rss2.php</a></li>
<li><a href="#trunktestsphpunittestsfeedrss2php">trunk/tests/phpunit/tests/feed/rss2.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesfeedatomphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/feed-atom.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed-atom.php 2015-11-04 16:35:02 UTC (rev 35505)
+++ trunk/src/wp-includes/feed-atom.php 2015-11-04 17:46:41 UTC (rev 35506)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,10 +78,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'atom_entry' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( get_comments_number() || comments_open() ) :
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <link rel="replies" type="<?php bloginfo_rss('html_type'); ?>" href="<?php the_permalink_rss() ?>#comments" thr:count="<?php echo get_comments_number()?>"/>
</span><span class="cx" style="display: block; padding: 0 10px"> <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()?>"/>
</span><span class="cx" style="display: block; padding: 0 10px"> <thr:total><?php echo get_comments_number()?></thr:total>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </entry>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endwhile ; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </feed>
</span></span></pre></div>
<a id="trunksrcwpincludesfeedrss2php"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/feed-rss2.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed-rss2.php 2015-11-04 16:35:02 UTC (rev 35505)
+++ trunk/src/wp-includes/feed-rss2.php 2015-11-04 17:46:41 UTC (rev 35506)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,7 +83,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <item>
</span><span class="cx" style="display: block; padding: 0 10px"> <title><?php the_title_rss() ?></title>
</span><span class="cx" style="display: block; padding: 0 10px"> <link><?php the_permalink_rss() ?></link>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php if ( get_comments_number() || comments_open() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <comments><?php comments_link_feed(); ?></comments>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_post_time('Y-m-d H:i:s', true), false); ?></pubDate>
</span><span class="cx" style="display: block; padding: 0 10px"> <dc:creator><![CDATA[<?php the_author() ?>]]></dc:creator>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_category_rss('rss2') ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,8 +102,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <content:encoded><![CDATA[<?php the_excerpt_rss(); ?>]]></content:encoded>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php if ( get_comments_number() || comments_open() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <wfw:commentRss><?php echo esc_url( get_post_comments_feed_link(null, 'rss2') ); ?></wfw:commentRss>
</span><span class="cx" style="display: block; padding: 0 10px"> <slash:comments><?php echo get_comments_number(); ?></slash:comments>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php rss_enclosure(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunktestsphpunittestsfeedrss2php"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/feed/rss2.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/feed/rss2.php 2015-11-04 16:35:02 UTC (rev 35505)
+++ trunk/tests/phpunit/tests/feed/rss2.php 2015-11-04 17:46:41 UTC (rev 35506)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,8 +102,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $xml = xml_to_array($feed);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // get all the rss -> channel -> item elements
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $items = xml_find($xml, 'rss', 'channel', 'item');
- $posts = get_posts('numberposts='.$this->post_count);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $items = xml_find( $xml, 'rss', 'channel', 'item' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // check each of the items against the known post data
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $items as $key => $item ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,4 +177,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( html_entity_decode( get_post_comments_feed_link( $post->ID) ), $comment_rss[0]['content'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @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' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>