Ticket #25229: wp-includes-feed-rss2-comments.diff

wp-includes/feed-rss2-comments.php

@@ -14 +14 @@
         xmlns:dc="http://purl.org/dc/elements/1.1/"
         xmlns:atom="http://www.w3.org/2005/Atom"
         xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
-        <?php do_action('rss2_ns'); do_action('rss2_comments_ns'); ?>
-        >
+        <?php 
+        //duplicate_hook 
+        do_action('rss2_ns'); 
+        ?>
+
+        <?php 
+        /**
+         * Fired at the end of the RSS root to add namespaces.
+         *
+         * @since 2.8.0
+         */
+        do_action('rss2_comments_ns'); 
+        ?>
+>
 <channel>
         <title><?php
                 if ( is_singular() )
@@ -29 +41 @@
         <link><?php (is_single()) ? the_permalink_rss() : bloginfo_rss("url") ?></link>
         <description><?php bloginfo_rss("description") ?></description>
         <lastBuildDate><?php echo mysql2date('r', get_lastcommentmodified('GMT')); ?></lastBuildDate>
+        <?php //duplicate_hook ?>
         <sy:updatePeriod><?php echo apply_filters( 'rss_update_period', 'hourly' ); ?></sy:updatePeriod>
+        <?php //duplicate_hook ?>
         <sy:updateFrequency><?php echo apply_filters( 'rss_update_frequency', '1' ); ?></sy:updateFrequency>
-        <?php do_action('commentsrss2_head'); ?>
+        <?php 
+        /**
+         * Fired at the end of the RSS2 comment Feed Header.
+         *
+         * @since 2.3.0
+         */
+        do_action('commentsrss2_head'); 
+        ?>
 <?php
 if ( have_comments() ) : while ( have_comments() ) : the_comment();
         $comment_post = $GLOBALS['post'] = get_post( $comment->comment_post_ID );
@@ -40 +61 @@
                 <title><?php
                         if ( !is_singular() ) {
                                 $title = get_the_title($comment_post->ID);
+                                //duplicate_hook
                                 $title = apply_filters('the_title_rss', $title);
                                 printf(ent2ncr(__('Comment on %1$s by %2$s')), $title, get_comment_author_rss());
                         } else {
@@ -57 +79 @@
                 <description><![CDATA[<?php comment_text_rss() ?>]]></description>
                 <content:encoded><![CDATA[<?php comment_text() ?>]]></content:encoded>
 <?php endif; // post pass
-        do_action('commentrss2_item', $comment->comment_ID, $comment_post->ID);
+        $comment_id = $comment->comment_ID;
+        $comment_post_id = $comment_post->ID;
+        /**
+         * Fired at the end of each RSS2 comment feed item.
+         *
+         * @since 2.1.0
+         *
+         * @param $comment_id The ID of the comment being displayed.
+         * @param $comment_post_id The ID of the post connected to the comment.
+         */
+        do_action('commentrss2_item', $comment_id, $comment_post_id);
 ?>
         </item>
 <?php endwhile; endif; ?>