Changeset 27456 for trunk/src/wp-includes/query.php

Timestamp:

03/07/2014 06:58:33 PM (12 years ago)

Author:

wonderboymusic

Message:

On second thought, allow posts_per_rss to be set in pre_get_posts to override the posts_per_rss option. There are backwards compatibility concerns otherwise.

Props nacin.
Partially reverts [27455]. Updates the unit test. See #25380.

File:

• trunk/src/wp-includes/query.php (modified) (2 diffs)

trunk/src/wp-includes/query.php

@@ -2249 +2249 @@
                 }
                 $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'] ) {
@@ -2270 +2266 @@
                 }
                 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;
                 }