Changeset 4934

Timestamp:

02/24/07 07:33:29 (2 years ago)

Author:

ryan

Message:

Comment feeds everywhere. Props mdawaffe and rob1n. fixes #2485

Files:

• trunk/wp-includes/comment-template.php (modified) (1 diff)
• trunk/wp-includes/feed-atom-comments.php (modified) (4 diffs)
• trunk/wp-includes/feed-rss2-comments.php (modified) (2 diffs)
• trunk/wp-includes/feed.php (modified) (1 diff)
• trunk/wp-includes/functions.php (modified) (2 diffs)
• trunk/wp-includes/query.php (modified) (10 diffs)

trunk/wp-includes/comment-template.php

@@ -291 +291 @@
-    }
-
-
+
+
+
-
-    define('COMMENTS_TEMPLATE', true);

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

@@ -9 +9 @@
->
-    <title type="text"><?php 
-is_single() || is_page()) {
+ is_singular() )
-            printf(__('Comments on: %s'), get_the_title_rss());
-
-
-
+
+
+
+
-    ?></title>
-    <subtitle type="text"><?php bloginfo_rss('description'); ?></subtitle>
@@ -25 +26 @@
-
-<?php
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-?>
-    <entry>
-        <title><?php
-!(is_single() || is_page())
-->comment_post_
+ !is_singular() 
+_post->
-                $title = apply_filters('the_title', $title);
-                $title = apply_filters('the_title_rss', $title);
@@ -70 +46 @@
-            <name><?php comment_author_rss(); ?></name>
-            <?php if (get_comment_author_url()) echo '<uri>' . get_comment_author_url() . '</uri>'; ?>
+
-        </author>
-        
@@ -75 +52 @@
-        <updated><?php echo mysql2date('D, d M Y H:i:s +0000', get_comment_time('Y-m-d H:i:s', true), false); ?></updated>
-        <published><?php echo mysql2date('D, d M Y H:i:s +0000', get_comment_time('Y-m-d H:i:s', true), false); ?></published>
-
-
+
-        <content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php echo get_the_password_form(); ?>]]></content>
-   <?php } else {
+<?php else : // post pass
-        <content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php comment_text(); ?>]]></content>
-
+
+
+
-    </entry>
-
-
-
-
-
-
-
+
-</feed>

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

@@ -8 +8 @@
-    xmlns:content="http://purl.org/rss/1.0/modules/content/">
-<channel>
-
-
-
-
-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>
+
+
+
+       printf(__('Comments for %s searching on %s'), get_bloginfo_rss( 'name' ), attribute_escape($wp_query->query_vars['s']));
+else
+
+
-    <link><?php (is_single()) ? permalink_single_rss() : bloginfo_rss("url") ?></link>
-    <description><?php bloginfo_rss("description") ?></description>
@@ -22 +22 @@
-
-<?php 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-?>
-    <item>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        <link><?php comment_link() ?></link>
-        <author><?php echo get_comment_author_rss() ?></author>
-        <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>
-
-
-
+
-        <description><?php _e('Protected Comments: Please enter your password to view comments.'); ?></description>
-        <content:encoded><![CDATA[<?php echo get_the_password_form() ?>]]></content:encoded>
-
-
-
+
-        <description><?php comment_text_rss() ?></description>
-        <content:encoded><![CDATA[<?php comment_text() ?>]]></content:encoded>
-
-
-
-
+
+
+
-    </item>
-
-
-
-
-
-
+
-</channel>
-</rss>

trunk/wp-includes/feed.php

@@ -11 +11 @@
-}
-
+function get_wp_title_rss($sep = '»') {
+    $title = wp_title($sep, false);
+    $title = apply_filters('get_wp_title_rss', $title);
+    return $title;
+}
-
-function get_the_title_rss() {

trunk/wp-includes/functions.php

@@ -940 +940 @@
-
-function do_feed() {
+    global $wp_query;
+
-    $feed = get_query_var('feed');
-
@@ -946 +948 @@
-
-    if ( $feed == '' || $feed == 'feed' )
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    $hook = 'do_feed_' . $feed;
-for_comments
+wp_query->is_comment_feed
-}
-

trunk/wp-includes/query.php

@@ -9 +9 @@
-
-    return $wp_query->get($var);
+}
+
+function set_query_var($var, $value) {
+    global $wp_query;
+
+    return $wp_query->set($var, $value);
-}
-
@@ -249 +255 @@
-    $wp_query->the_post();
-}
+
+/*
+ * Comments loop. 
+ */ 
+
+function have_comments() { 
+    global $wp_query; 
+    return $wp_query->have_comments(); 
+} 
+
+function the_comment() { 
+    global $wp_query; 
+    return $wp_query->the_comment(); 
+}  
-
-/*
@@ -266 +286 @@
-    var $in_the_loop = false;
-    var $post;
+    
+    var $comments;
+    var $comment_count = 0;
+    var $current_comment = -1;
+    var $comment;
-
-    var $found_posts = 0;
@@ -283 +308 @@
-    var $is_search = false;
-    var $is_feed = false;
+    var $is_comment_feed = false;
-    var $is_trackback = false;
-    var $is_home = false;
@@ -306 +332 @@
-        $this->is_search = false;
-        $this->is_feed = false;
+        $this->is_comment_feed = false;
-        $this->is_trackback = false;
-        $this->is_home = false;
@@ -538 +565 @@
-            $this->is_singular = true;
-
+        if ( false !== strpos($qv['feed'], 'comments-') ) {
+            $this->query_vars['feed'] = $qv['feed'] = str_replace('comments-', '', $qv['feed']);
+            $qv['withcomments'] = 1;
+        }
+
+        if ( $this->is_feed && (!empty($qv['withcomments']) || ( empty($qv['withoutcomments']) && $this->is_singular ) ) )
+            $this->is_comment_feed = true;
+
-        if ( ! ($this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_comments_popup)) {
-            $this->is_home = true;
@@ -967 +1002 @@
-            }
-        }
+        
+        // Comments feeds
+        if ( $this->is_comment_feed && ( $this->is_archive || $this->is_search || !$this->is_singular ) ) {
+            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 { // Other non singular e.g. front
+                $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);
+            
+            $this->comments = (array) $wpdb->get_results("SELECT $distinct $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby ORDER BY comment_date_gmt DESC LIMIT " . get_settings('posts_per_rss'));
+            $this->comment_count = count($this->comments);
+
+            $post_ids = array();
+            
+            foreach ($this->comments as $comment)
+                $post_ids[] = (int) $comment->comment_post_ID;
+            
+            $post_ids = join(',', $post_ids);
+            $join = '';
+            if ( $post_ids )
+                $where = "AND $wpdb->posts.ID IN ($post_ids) ";
+            else
+                $where = "AND 0";
+        }
-
-        // Apply post-paging filters on where and join.  Only plugins that
@@ -987 +1054 @@
-
-        $this->posts = $wpdb->get_results($this->request);
+
+        if ( $this->is_comment_feed && $this->is_singular ) {
+            $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);
+            $this->comment_count = count($this->comments);
+        }
+        
-        if ( !empty($limits) ) {
-            $found_posts_query = apply_filters( 'found_posts_query', 'SELECT FOUND_ROWS()' );
@@ -993 +1069 @@
-            $this->max_num_pages = ceil($this->found_posts / $q['posts_per_page']);
-        }
+        
-        // Check post status to determine if post should be displayed.
-        if ( !empty($this->posts) && ($this->is_single || $this->is_page) ) {
@@ -1072 +1149 @@
-        }
-    }
+    
+    function next_comment() {
+        $this->current_comment++;
+        
+        $this->comment = $this->comments[$this->current_comment];
+        return $this->comment;
+    }
+    
+    function the_comment() {
+        global $comment;
+        
+        $comment = $this->next_comment();
+        
+        if ($this->current_comment == 0) {
+            do_action('comment_loop_start');
+        }
+    }
+    
+    function have_comments() {
+        if ($this->current_comment + 1 < $this->comment_count) {
+            return true;
+        } elseif ($this->current_comment + 1 == $this->comment_count) {
+            $this->rewind_comments();
+        }
+        
+        return false;
+    }
+    
+    function rewind_comments() {
+        $this->current_comment = -1;
+        if ($this->comment_count > 0) {
+            $this->comment = $this->comments[0];
+        }
+    }
-
-    function &query($query) {