Changeset 37712 for trunk

Timestamp:

06/15/2016 12:32:25 PM (10 years ago)

Author:

boonebgorges

Message:

Query: After [37692], don't skip set_found_posts() when no posts are found.

The 'found_posts' filter must continue to run for plugins manipulating post
results via filter.

Props dd32.
Fixes #36687.

Location:

trunk

Files:

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

trunk/src/wp-includes/query.php

@@ -3651 +3651 @@
                 }
 
-                // Convert to WP_Post objects and set the found-post totals.
+                $this->set_found_posts( $q, $limits );
+
+                // Convert to WP_Post objects.
                 if ( $this->posts ) {
                         $this->posts = array_map( 'get_post', $this->posts );
-                        $this->set_found_posts( $q, $limits );
                 }
 

trunk/tests/phpunit/tests/post/query.php

@@ -413 +413 @@
                 return array( 12345 );
         }
+
+        /**
+         * @ticket 36687
+         */
+        public function test_posts_pre_query_filter_should_respect_set_found_posts() {
+                global $wpdb;
+
+                $this->post_id = self::factory()->post->create();
+
+                // Prevent the DB query
+                add_filter( 'posts_request', '__return_empty_string' );
+                add_filter( 'found_posts_query', '__return_empty_string' );
+
+                // Add the post and found_posts
+                add_filter( 'the_posts', array( $this, 'filter_the_posts' ) );
+                add_filter( 'found_posts', array( $this, 'filter_found_posts' ) );
+
+                $q = new WP_Query( array( 'suppress_filters' => false ) );
+
+                remove_filter( 'posts_request', '__return_empty_string' );
+                remove_filter( 'found_posts_query', '__return_empty_string' );
+                remove_filter( 'the_posts', array( $this, 'filter_the_posts' ) );
+                remove_filter( 'found_posts', array( $this, 'filter_found_posts' ) );
+
+                $this->assertSame( array( $this->post_id ), wp_list_pluck( $q->posts, 'ID' ) );
+                $this->assertSame( 1, $q->found_posts );
+        }
+
+        public function filter_the_posts() {
+                return array( get_post( $this->post_id ) );
+        }
+
+        public function filter_found_posts( $posts ) {
+                return 1;
+        }
 }