WP Merge to rev 5499, this is a big one! Test it before you put it live!

Test only, not for production use yet


git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@972 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 4 insertions, 2 deletions

diff --git a/wp-includes/query.php b/wp-includes/query.php
index 26e1afc..05dc692 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -888,6 +888,8 @@ class WP_Query {
 			$groupby = "{$wpdb->posts}.ID";

 		}

 

+

+

 		// Author/user stuff

 

 		if ( empty($q['author']) || ($q['author'] == '0') ) {

@@ -1023,7 +1025,7 @@ class WP_Query {
 			$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->comments = (array) $wpdb->get_results("SELECT $distinct $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby ORDER BY comment_date_gmt DESC LIMIT " . get_option('posts_per_rss'));

 			$this->comment_count = count($this->comments);

 

 			$post_ids = array();

@@ -1062,7 +1064,7 @@ class WP_Query {
 		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');

+			$comments_request = "SELECT $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere ORDER BY comment_date_gmt DESC LIMIT " . get_option('posts_per_rss');

 			$this->comments = $wpdb->get_results($comments_request);

 			$this->comment_count = count($this->comments);

 		}