Changeset 49923

Timestamp:

01/03/2021 02:37:23 AM (4 years ago)

Author:

TimothyBlynJacobs

Message:

REST API: Move the WP_Query args filter after the tax_query is setup.

This ensures that the entire list of WP_Query args are filterable in the posts controller.

Props Krstarica, TimothyBlynJacobs.
Fixes #42762.

File:

• trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php (modified) (4 diffs)

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php

@@ -263 +263 @@
         }
 
-        // Force the post_type argument, since it's not a user input variable.
-        $args['post_type'] = $this->post_type;
-
-        /**
-         * Filters WP_Query arguments when querying users via the REST API.
-         *
-         * The dynamic portion of the hook name, `$this->post_type`, refers to the post type slug.
-         *
-         * Possible filter names include:
-         *
-         *  - `rest_post_query`
-         *  - `rest_page_query`
-         *  - `rest_attachment_query`
-         *
-         * Enables adding extra arguments or setting defaults for a post collection request.
-         *
-         * @since 4.7.0
-         *
-         * @link https://developer.wordpress.org/reference/classes/wp_query/
-         *
-         * @param array           $args    Array of arguments to be passed to WP_Query.
-         * @param WP_REST_Request $request The REST API request.
-         */
-        $args       = apply_filters( "rest_{$this->post_type}_query", $args, $request );
-        $query_args = $this->prepare_items_query( $args, $request );
-
         $taxonomies = wp_list_filter( get_object_taxonomies( $this->post_type, 'objects' ), array( 'show_in_rest' => true ) );
 
         if ( ! empty( $request['tax_relation'] ) ) {
-            $query_args['tax_query'] = array( 'relation' => $request['tax_relation'] );
+            $args['tax_query'] = array( 'relation' => $request['tax_relation'] );
         }
 
@@ -300 +274 @@
 
             if ( ! empty( $request[ $base ] ) ) {
-                $query_args['tax_query'][] = array(
+                $args['tax_query'][] = array(
                     'taxonomy'         => $taxonomy->name,
                     'field'            => 'term_id',
@@ -309 +283 @@
 
             if ( ! empty( $request[ $tax_exclude ] ) ) {
-                $query_args['tax_query'][] = array(
+                $args['tax_query'][] = array(
                     'taxonomy'         => $taxonomy->name,
                     'field'            => 'term_id',
@@ -318 +292 @@
             }
         }
+
+        // Force the post_type argument, since it's not a user input variable.
+        $args['post_type'] = $this->post_type;
+
+        /**
+         * Filters WP_Query arguments when querying users via the REST API.
+         *
+         * The dynamic portion of the hook name, `$this->post_type`, refers to the post type slug.
+         *
+         * Possible filter names include:
+         *
+         *  - `rest_post_query`
+         *  - `rest_page_query`
+         *  - `rest_attachment_query`
+         *
+         * Enables adding extra arguments or setting defaults for a post collection request.
+         *
+         * @since 4.7.0
+         * @since 5.7.0 Moved after the `tax_query` query arg is generated.
+         *
+         * @link https://developer.wordpress.org/reference/classes/wp_query/
+         *
+         * @param array           $args    Array of arguments to be passed to WP_Query.
+         * @param WP_REST_Request $request The REST API request.
+         */
+        $args       = apply_filters( "rest_{$this->post_type}_query", $args, $request );
+        $query_args = $this->prepare_items_query( $args, $request );
 
         $posts_query  = new WP_Query();