From f9d5ef9fbb062b0c44c09207f947b515ab6dc66e Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Thu, 7 Dec 2006 16:58:13 +0000
Subject: WP Merge to rev 4626

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@821 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-includes/query.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'wp-includes/query.php')

diff --git a/wp-includes/query.php b/wp-includes/query.php
index c04f378..8114bd5 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -609,6 +609,7 @@ class WP_Query {
 		}
 		if ( $this->is_feed ) {
 			$q['posts_per_page'] = get_option('posts_per_rss');
+			$q['nopaging'] = false;
 		}
 		$q['posts_per_page'] = (int) $q['posts_per_page'];
 		if ( $q['posts_per_page'] < -1 )
-- 
cgit