Ticket #25380: 25380.2.diff

wp-includes/query.php

@@ -2248 +2248 @@
                                 $q['post_type'] = '';
                 }
                 $post_type = $q['post_type'];
-                if ( ! isset( $q['posts_per_page'] ) || $q['posts_per_page'] == 0 ) {
-                        if ( $this->is_feed ) {
-                                $q['posts_per_page'] = get_option( 'posts_per_rss' );
-                        } else {
-                                $q['posts_per_page'] = get_option( 'posts_per_page' );
-                        }
+                if ( empty( $q['posts_per_page'] ) ) {
+                        $q['posts_per_page'] = get_option( 'posts_per_page' );
                 }
                 if ( isset($q['showposts']) && $q['showposts'] ) {
                         $q['showposts'] = (int) $q['showposts'];
@@ -2269 +2265 @@
                         }
                 }
                 if ( $this->is_feed ) {
+                        // This overrides posts_per_page.
+                        if ( ! empty( $q['posts_per_rss'] ) ) {
+                                $q['posts_per_page'] = $q['posts_per_rss'];
+                        } else {
+                                $q['posts_per_page'] = get_option( 'posts_per_rss' );
+                        }
                         $q['nopaging'] = false;
                 }
                 $q['posts_per_page'] = (int) $q['posts_per_page'];