Changeset 3644

Timestamp:

03/17/2006 01:16:22 AM (19 years ago)

Author:

ryan

Message:

Comment feed fixes from David House. fixes #2570

Location:

trunk

Files:

• wp-commentsrss2.php (modified) (3 diffs)
• wp-includes/functions.php (modified) (3 diffs)
• wp-includes/template-functions-post.php (modified) (1 diff)

trunk/wp-commentsrss2.php

@@ -32 +32 @@
             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' 
+            LEFT JOIN $wpdb->posts ON comment_post_id = id WHERE comment_post_ID = '" . get_the_ID() . "' 
             AND $wpdb->comments.comment_approved = '1' AND $wpdb->posts.post_status = 'publish' 
             AND post_date_gmt < '" . gmdate("Y-m-d H:i:59") . "' 
@@ -47 +47 @@
         if ($comments) {
             foreach ($comments as $comment) {
+                $GLOBALS['comment'] =& $comment;
                 // Some plugins may need to know the metadata
                 // associated with this comment's post:
@@ -78 +79 @@
     </item>
 <?php 
-            }
+            } 
         }
     }

trunk/wp-includes/functions.php

@@ -2016 +2016 @@
 function load_template($file) {
     global $posts, $post, $wp_did_header, $wp_did_template_redirect, $wp_query,
-        $wp_rewrite, $wpdb, $wp_version, $wp;
+        $wp_rewrite, $wpdb, $wp_version, $wp, $id, $comment;
 
     extract($wp_query->query_vars);
@@ -2221 +2221 @@
 
     $for_comments = false;
-    if ( is_single() || ($withcomments == 1) ) {
+    if ( is_single() || (get_query_var('withcomments') == 1) ) {
         $feed = 'rss2';
         $for_comments = true;   
@@ -2239 +2239 @@
 
 function do_feed_rss2($for_comments) {
-    if ( $for_comments ) 
+    if ( $for_comments ) {
         load_template(ABSPATH . 'wp-commentsrss2.php');
-    else
+    } else {
         load_template(ABSPATH . 'wp-rss2.php');
+    }
 }
 

trunk/wp-includes/template-functions-post.php

@@ -16 +16 @@
 }
 
+function get_the_ID() {
+    global $id;
+    return $id;
+}
 
 function the_title($before = '', $after = '', $echo = true) {