Changeset 27455

Timestamp:

03/07/2014 06:32:40 PM (12 years ago)

Author:

wonderboymusic

Message:

When setting posts_per_page in WP_Query::get_posts(), check for is_feed() in the same place where posts_per_page is set when it is not already set. Previously, when is_feed() was true, posts_per_page would be arbitrarily overwritten. This fix allows posts_per_page to be set during pre_get_posts when is_feed() is true and not be overwritten.

Adds unit test.

Props wokamoto.
Fixes #25380.

Location:

trunk

Files:

• src/wp-includes/query.php (modified) (2 diffs)
• tests/phpunit/tests/query.php (modified) (1 diff)

trunk/src/wp-includes/query.php

@@ -2249 +2249 @@
                 }
                 $post_type = $q['post_type'];
-                if ( !isset($q['posts_per_page']) || $q['posts_per_page'] == 0 )
-                        $q['posts_per_page'] = get_option('posts_per_page');
+                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 ( isset($q['showposts']) && $q['showposts'] ) {
                         $q['showposts'] = (int) $q['showposts'];
@@ -2265 +2270 @@
                 }
                 if ( $this->is_feed ) {
-                        $q['posts_per_page'] = get_option('posts_per_rss');
                         $q['nopaging'] = false;
                 }

trunk/tests/phpunit/tests/query.php

@@ -88 +88 @@
                 $this->assertTrue( $query->get( 'nonexistent', true ) );
         }
+
+        /**
+         * @ticket 25380
+         */
+        function test_pre_posts_per_page() {
+                $this->factory->post->create_many( 10 );
+
+                add_action( 'pre_get_posts', array( $this, 'filter_posts_per_page' ) );
+
+                $this->go_to( get_feed_link() );
+
+                $this->assertEquals( 30, get_query_var( 'posts_per_page' ) );
+        }
+
+        function filter_posts_per_page( &$query ) {
+                $query->set( 'posts_per_page', 30 );
+        }
 }