Ticket #2485: commentfeed.diff

wp-includes/default-filters.php

@@ -72 +72 @@
 // RSS filters
 add_filter('the_title_rss', 'strip_tags');
 add_filter('the_title_rss', 'ent2ncr', 8);
+add_filter('get_wp_title_rss', 'ent2ncr', 8);
 add_filter('the_content_rss', 'ent2ncr', 8);
 add_filter('the_excerpt_rss', 'convert_chars');
 add_filter('the_excerpt_rss', 'ent2ncr', 8);

wp-includes/classes.php

@@ -12 +12 @@
         var $current_post = -1;
         var $in_the_loop = false;
         var $post;
+        var $comments;
 
         var $is_single = false;
         var $is_preview = false;
@@ -26 +27 @@
         var $is_category = false;
         var $is_search = false;
         var $is_feed = false;
+        var $is_comment_feed = false;
         var $is_trackback = false;
         var $is_home = false;
         var $is_404 = false;
@@ -46 +48 @@
                 $this->is_category = false;
                 $this->is_search = false;
                 $this->is_feed = false;
+                $this->is_comment_feed = false;
                 $this->is_trackback = false;
                 $this->is_home = false;
                 $this->is_404 = false;
@@ -215 +218 @@
                         $this->is_feed = true;
                 }
 
+                if ($this->is_feed && ( '' != $qv['withcomments'] || $this->is_single || $this->is_page )) {
+                        $this->is_comment_feed = true;
+                }
+
                 if ('' != $qv['tb']) {
                         $this->is_trackback = true;
                 }
@@ -630 +637 @@
                         }
                 }
 
+                if ( $this->is_comment_feed && ( ( $this->is_archive || $this->is_search ) || ( !$this->is_single && !$this->is_page ) ) ) { // Grab the comments then cache the posts
+                        if ( $this->is_archive || $this->is_search ) {
+                                $cjoin = "LEFT JOIN $wpdb->posts ON ( $wpdb->comments.comment_post_ID = $wpdb->posts.ID ) $join ";
+                                $cwhere = "WHERE comment_approved = '1' $where";
+                                $cgroupby = "GROUP BY $wpdb->comments.comment_id";
+                        } else if ( !$this->is_single && !$this->is_page ) { // main feed
+                                $cjoin = "LEFT JOIN $wpdb->posts ON ( $wpdb->comments.comment_post_ID = $wpdb->posts.ID )";
+                                $cwhere = "WHERE post_status = 'publish' AND comment_approved = '1'";
+                                $cgroupby = '';
+                        }
+                        $cjoin = apply_filters('comment_feed_join', $cjoin);
+                        $cwhere = apply_filters('comment_feed_where', $cwhere);
+                        $cgroupby = apply_filters('comment_feed_groupby', $cgroupby);
+                        $comments_request = "SELECT $distinct $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere GROUP BY $wpdb->comments.comment_id ORDER BY comment_date_gmt DESC LIMIT " . get_settings('posts_per_rss');
+                        $this->comments = $wpdb->get_results($comments_request);
+                        $post_ids = array();
+                        foreach ( $this->comments as $comment )
+                                $post_ids[] = (int) $comment->comment_post_ID;
+                        $post_ids = join(',', $post_ids);
+                        $join = '';
+                        $where = " AND $wpdb->posts.ID IN ($post_ids) ";
+                }
+
+
                 // Apply post-paging filters on where and join.  Only plugins that
                 // manipulate paging queries should use these hooks.
                 $where = apply_filters('posts_where_paged', $where);
@@ -637 +668 @@
                 $groupby = apply_filters('posts_groupby', $groupby);
                 $join = apply_filters('posts_join_paged', $join);
                 $orderby = "post_" . $q['orderby'];
-                $orderby = apply_filters('posts_orderby', $orderby); 
+                $orderby = apply_filters('posts_orderby', $orderby);
+
                 $request = " SELECT $distinct * FROM $wpdb->posts $join WHERE 1=1" . $where . " GROUP BY " . $groupby . " ORDER BY " . $orderby . " $limits";
                 $this->request = apply_filters('posts_request', $request);
 
                 $this->posts = $wpdb->get_results($this->request);
 
+                if ( $this->is_comment_feed && ( $this->is_single || $this->is_page ) ) { // Cache the post then grab its comments
+                        $cjoin = apply_filters('comment_feed_join', '');
+                        $cwhere = apply_filters('comment_feed_where', "WHERE comment_post_ID = {$this->posts[0]->ID} AND comment_approved = '1'");
+                        $comments_request = "SELECT $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere ORDER BY comment_date_gmt DESC LIMIT " . get_settings('posts_per_rss');
+                        $this->comments = $wpdb->get_results($comments_request);
+                }
+
                 // Check post status to determine if post should be displayed.
                 if ($this->is_single || $this->is_page) {
                         $status = get_post_status($this->posts[0]);

wp-includes/feed-functions.php

@@ -9 +9 @@
         echo get_bloginfo_rss($show);
 }
 
+function get_wp_title_rss() {
+        return apply_filters( 'get_wp_title_rss', wp_title( '»', false ) );
+}
+
 function get_the_title_rss() {
         $title = get_the_title();
         $title = apply_filters('the_title', $title);
@@ -161 +165 @@
         }
 }
 
-?>
- No newline at end of file
+?>

wp-commentsrss2.php

@@ -20 +20 @@
         if ($i < 1) {
                 $i++;
 ?>
-        <title><?php if (is_single() || is_page() ) { printf(__('Comments on: %s'), get_the_title_rss()); } else { printf(__('Comments for %s'), get_bloginfo_rss("name")); } ?></title>
-        <link><?php (is_single()) ? permalink_single_rss() : bloginfo_rss("url") ?></link>
-        <description><?php bloginfo_rss("description") ?></description>
+        <title><?php printf(__('Comments on: %s'), get_bloginfo_rss('name') . get_wp_title_rss()); ?></title>
+        <link><?php (is_single() || is_page()) ? permalink_single_rss() : bloginfo_rss("url"); // is_archive || is_search need links ?></link>
+        <description><?php bloginfo_rss("description"); // need different description for !main_feed ?></description>
         <pubDate><?php echo gmdate('r'); ?></pubDate>
         <generator>http://wordpress.org/?v=<?php echo $wp_version ?></generator>
 
 <?php 
-                if (is_single() || is_page()) {
-                        $comments = $wpdb->get_results("SELECT comment_ID, comment_author, comment_author_email, 
-                        comment_author_url, comment_date, comment_date_gmt, comment_content, comment_post_ID, 
-                        $wpdb->posts.ID, $wpdb->posts.post_password FROM $wpdb->comments 
-                        LEFT JOIN $wpdb->posts ON comment_post_id = id WHERE comment_post_ID = '$id' 
-                        AND $wpdb->comments.comment_approved = '1' AND $wpdb->posts.post_status = 'publish' 
-                        AND post_date_gmt < '" . gmdate("Y-m-d H:i:59") . "' 
-                        ORDER BY comment_date_gmt DESC LIMIT " . get_settings('posts_per_rss') );
-                } else { // if no post id passed in, we'll just ue the last 10 comments.
-                        $comments = $wpdb->get_results("SELECT comment_ID, comment_author, comment_author_email, 
-                        comment_author_url, comment_date, comment_date_gmt, comment_content, comment_post_ID, 
-                        $wpdb->posts.ID, $wpdb->posts.post_password FROM $wpdb->comments 
-                        LEFT JOIN $wpdb->posts ON comment_post_id = id WHERE $wpdb->posts.post_status = 'publish' 
-                        AND $wpdb->comments.comment_approved = '1' AND post_date_gmt < '" . gmdate("Y-m-d H:i:s") . "'  
-                        ORDER BY comment_date_gmt DESC LIMIT " . get_settings('posts_per_rss') );
-                }
-        // this line is WordPress' motor, do not delete it.
-                if ($comments) {
-                        foreach ($comments as $comment) {
+                if ($wp_query->comments) {
+                        foreach ($wp_query->comments as $comment) {
                                 // Some plugins may need to know the metadata
                                 // associated with this comment's post:
+                                $comment_post = get_post($comment->comment_post_ID);
                                 get_post_custom($comment->comment_post_ID);
 ?>
         <item>
@@ -63 +47 @@
                 <pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_comment_time('Y-m-d H:i:s', true), false); ?></pubDate>
                 <guid><?php comment_link() ?></guid>
                         <?php 
-                        if (!empty($comment->post_password) && $_COOKIE['wp-postpass'] != $comment->post_password) {
+                        if (!empty($comment_post->post_password) && $_COOKIE['wp-postpass'] != $comment_post->post_password) {
                         ?>
                 <description><?php _e('Protected Comments: Please enter your password to view comments.'); ?></description>
                 <content:encoded><![CDATA[<?php echo get_the_password_form() ?>]]></content:encoded>