Ticket #9134: 9134-v2.patch

feed-atom.php

@@ -47 +47 @@
 <?php endif; ?>
 <?php atom_enclosure(); ?>
 <?php do_action('atom_entry'); ?>
-                <link rel="replies" type="text/html" href="<?php the_permalink_rss() ?>#comments" thr:count="<?php echo get_comments_number()?>"/>
-                <link rel="replies" type="application/atom+xml" href="<?php echo get_post_comments_feed_link(0,'atom') ?>" thr:count="<?php echo get_comments_number()?>"/>
-                <thr:total><?php echo get_comments_number()?></thr:total>
+<?php if(($comments_number=get_comments_number())>0||comments_open()===true):?>
+                <link rel="replies" type="text/html" href="<?php the_permalink_rss() ?>#comments" thr:count="<?php echo $comments_number;?>" />
+                <link rel="replies" type="application/atom+xml" href="<?php echo get_post_comments_feed_link(0,'atom') ?>" thr:count="<?php echo $comments_number;?>" />
+                <thr:total><?php echo $comments_number;?></thr:total>
+<?php endif;?>
         </entry>
         <?php endwhile ; ?>
 </feed>

feed-rss2.php

@@ -35 +35 @@
         <item>
                 <title><?php the_title_rss() ?></title>
                 <link><?php the_permalink_rss() ?></link>
-                <comments><?php comments_link(); ?></comments>
                 <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><?php the_author() ?></dc:creator>
                 <?php the_category_rss() ?>
@@ -51 +50 @@
                 <content:encoded><![CDATA[<?php the_excerpt_rss() ?>]]></content:encoded>
         <?php endif; ?>
 <?php endif; ?>
+<?php if(get_comments_number()>0||comments_open()===true):?>
+                <comments><?php comments_link(); ?></comments>
                 <wfw:commentRss><?php echo get_post_comments_feed_link(); ?></wfw:commentRss>
                 <slash:comments><?php echo get_comments_number(); ?></slash:comments>
+<?php endif;?>
 <?php rss_enclosure(); ?>
         <?php do_action('rss2_item'); ?>
         </item>