Ticket #42762: 42762.diff

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

@@ -251 +251 @@
                         }
                 }
 
-                // Force the post_type argument, since it's not a user input variable.
-                $args['post_type'] = $this->post_type;
-
-                /**
-                 * Filters the query arguments for a request.
-                 *
-                 * 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    Key value array of query var to query value.
-                 * @param WP_REST_Request $request The request used.
-                 */
-                $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 ) );
 
                 foreach ( $taxonomies as $taxonomy ) {
@@ -276 +258 @@
                         $tax_exclude = $base . '_exclude';
 
                         if ( ! empty( $request[ $base ] ) ) {
-                                $query_args['tax_query'][] = array(
+                                $args['tax_query'][] = array(
                                         'taxonomy'         => $taxonomy->name,
                                         'field'            => 'term_id',
                                         'terms'            => $request[ $base ],
@@ -285 +267 @@
                         }
 
                         if ( ! empty( $request[ $tax_exclude ] ) ) {
-                                $query_args['tax_query'][] = array(
+                                $args['tax_query'][] = array(
                                         'taxonomy'         => $taxonomy->name,
                                         'field'            => 'term_id',
                                         'terms'            => $request[ $tax_exclude ],
@@ -295 +277 @@
                         }
                 }
 
+                // Force the post_type argument, since it's not a user input variable.
+                $args['post_type'] = $this->post_type;
+
+                /**
+                 * Filters the query arguments for a request.
+                 *
+                 * 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    Key value array of query var to query value.
+                 * @param WP_REST_Request $request The request used.
+                 */
+                $args       = apply_filters( "rest_{$this->post_type}_query", $args, $request );
+                $query_args = $this->prepare_items_query( $args, $request );
+
                 $posts_query  = new WP_Query();
                 $query_result = $posts_query->query( $query_args );