Ticket #36687: 36687.diff

src/wp-includes/query.php

@@ -3548 +3548 @@
                         $this->request = apply_filters_ref_array( 'posts_request', array( $this->request, &$this ) );
                 }
 
+                /**
+                 * Filter the posts array before the query takes place.
+                 *
+                 * Return a non-null value to bypass WordPress's default post queries.
+                 *
+                 * @since 4.6.0
+                 *
+                 * @param array|null $posts Return an array of post data to short-circuit WP's query,
+                 *                          or null to allow WP to run its normal queries.
+                 * @param WP_Query   $this  The WP_Query instance, passed by reference.
+                 */
+                $this->posts = apply_filters_ref_array( 'posts_pre_query', array( null, &$this ) );
+
                 if ( 'ids' == $q['fields'] ) {
-                        $this->posts = $wpdb->get_col( $this->request );
+                        if ( null === $this->posts ) {
+                                $this->posts = $wpdb->get_col( $this->request );
+                        }
+
                         $this->posts = array_map( 'intval', $this->posts );
                         $this->post_count = count( $this->posts );
                         $this->set_found_posts( $q, $limits );
@@ -3558 +3574 @@
                 }
 
                 if ( 'id=>parent' == $q['fields'] ) {
-                        $this->posts = $wpdb->get_results( $this->request );
+                        if ( null === $this->posts ) {
+                                $this->posts = $wpdb->get_results( $this->request );
+                        }
+
                         $this->post_count = count( $this->posts );
                         $this->set_found_posts( $q, $limits );
 
@@ -3573 +3592 @@
                         return $r;
                 }
 
-                $split_the_query = ( $old_request == $this->request && "$wpdb->posts.*" == $fields && !empty( $limits ) && $q['posts_per_page'] < 500 );
-
-                /**
-                 * Filter whether to split the query.
-                 *
-                 * Splitting the query will cause it to fetch just the IDs of the found posts
-                 * (and then individually fetch each post by ID), rather than fetching every
-                 * complete row at once. One massive result vs. many small results.
-                 *
-                 * @since 3.4.0
-                 *
-                 * @param bool     $split_the_query Whether or not to split the query.
-                 * @param WP_Query $this            The WP_Query instance.
-                 */
-                $split_the_query = apply_filters( 'split_the_query', $split_the_query, $this );
-
-                if ( $split_the_query ) {
-                        // First get the IDs and then fill in the objects
-
-                        $this->request = "SELECT $found_rows $distinct $wpdb->posts.ID FROM $wpdb->posts $join WHERE 1=1 $where $groupby $orderby $limits";
+                if ( null === $this->posts ) {
+                        $split_the_query = ( $old_request == $this->request && "$wpdb->posts.*" == $fields && !empty( $limits ) && $q['posts_per_page'] < 500 );
 
                         /**
-                         * Filter the Post IDs SQL request before sending.
+                         * Filter whether to split the query.
+                         *
+                         * Splitting the query will cause it to fetch just the IDs of the found posts
+                         * (and then individually fetch each post by ID), rather than fetching every
+                         * complete row at once. One massive result vs. many small results.
                          *
                          * @since 3.4.0
                          *
-                         * @param string   $request The post ID request.
-                         * @param WP_Query $this    The WP_Query instance.
+                         * @param bool     $split_the_query Whether or not to split the query.
+                         * @param WP_Query $this            The WP_Query instance.
                          */
-                        $this->request = apply_filters( 'posts_request_ids', $this->request, $this );
+                        $split_the_query = apply_filters( 'split_the_query', $split_the_query, $this );
+
+                        if ( $split_the_query ) {
+                                // First get the IDs and then fill in the objects
+
+                                $this->request = "SELECT $found_rows $distinct $wpdb->posts.ID FROM $wpdb->posts $join WHERE 1=1 $where $groupby $orderby $limits";
+
+                                /**
+                                 * Filter the Post IDs SQL request before sending.
+                                 *
+                                 * @since 3.4.0
+                                 *
+                                 * @param string   $request The post ID request.
+                                 * @param WP_Query $this    The WP_Query instance.
+                                 */
+                                $this->request = apply_filters( 'posts_request_ids', $this->request, $this );
 
-                        $ids = $wpdb->get_col( $this->request );
+                                $ids = $wpdb->get_col( $this->request );
 
-                        if ( $ids ) {
-                                $this->posts = $ids;
-                                $this->set_found_posts( $q, $limits );
-                                _prime_post_caches( $ids, $q['update_post_term_cache'], $q['update_post_meta_cache'] );
+                                if ( $ids ) {
+                                        $this->posts = $ids;
+                                        _prime_post_caches( $ids, $q['update_post_term_cache'], $q['update_post_meta_cache'] );
+                                } else {
+                                        $this->posts = array();
+                                }
                         } else {
-                                $this->posts = array();
+                                $this->posts = $wpdb->get_results( $this->request );
                         }
-                } else {
-                        $this->posts = $wpdb->get_results( $this->request );
-                        $this->set_found_posts( $q, $limits );
                 }
 
-                // Convert to WP_Post objects
-                if ( $this->posts )
+                // Convert to WP_Post objects.
+                if ( $this->posts ) {
+                        $this->set_found_posts( $q, $limits );
                         $this->posts = array_map( 'get_post', $this->posts );
+                }
 
                 if ( ! $q['suppress_filters'] ) {
                         /**

tests/phpunit/tests/post/query.php

@@ -388 +388 @@
                 $actual_posts = $q->get_posts();
                 $this->assertEqualSets( $requested, $actual_posts );
         }
+
+        /**
+         * @ticket 36687
+         */
+        public function test_posts_pre_query_filter_should_bypass_database_query() {
+                global $wpdb;
+
+                add_filter( 'posts_pre_query', array( __CLASS__, 'filter_posts_pre_query' ) );
+
+                $num_queries = $wpdb->num_queries;
+                $q = new WP_Query( array(
+                        'fields' => 'ids',
+                        'no_found_rows' => true,
+                ) );
+
+                remove_filter( 'posts_pre_query', array( __CLASS__, 'filter_posts_pre_query' ) );
+
+                $this->assertSame( $num_queries, $wpdb->num_queries );
+                $this->assertSame( array( 12345 ), $q->posts );
+        }
+
+        public static function filter_posts_pre_query( $posts ) {
+                return array( 12345 );
+        }
 }