summaryrefslogtreecommitdiffstats
path: root/wp-includes/query.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-12-07 16:58:13 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-12-07 16:58:13 +0000
commitf9d5ef9fbb062b0c44c09207f947b515ab6dc66e (patch)
treed1cfa030e80a5f08ac79fb21281e647ee8a86026 /wp-includes/query.php
parentd3ac809ed8a43bde6ea954329b3291fd9ca4aad5 (diff)
downloadwordpress-mu-f9d5ef9fbb062b0c44c09207f947b515ab6dc66e.tar.gz
wordpress-mu-f9d5ef9fbb062b0c44c09207f947b515ab6dc66e.tar.xz
wordpress-mu-f9d5ef9fbb062b0c44c09207f947b515ab6dc66e.zip
WP Merge to rev 4626
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@821 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/query.php')
-rw-r--r--wp-includes/query.php1
1 files changed, 1 insertions, 0 deletions
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 )