Changeset 62776

Timestamp:

07/17/2026 04:36:47 PM (8 weeks ago)

Author:

desrosj

Message:

Grouped backports to the 6.8 branch.

• REST API: sub-requests must always use dispatch.
• REST API: Ensure errors in batch requests propogate.
• Query: Force authornot_in values to be integers.

Merges [62769], [62770], [62771] to the 6.8 branch.

Props peterwilsoncc, westonruter, xknown, joehoyle, sergeybiryukov, jorbin, johnbillion, desrosj, clorith, ehtis.

Location:

branches/6.8/src/wp-includes

Files:

• class-wp-query.php (modified) (1 diff)
• rest-api.php (modified) (1 diff)
• rest-api/class-wp-rest-server.php (modified) (2 diffs)

branches/6.8/src/wp-includes/class-wp-query.php

@@ -2402 +2402 @@
 
                 if ( ! empty( $q['author__not_in'] ) ) {
-                        if ( is_array( $q['author__not_in'] ) ) {
-                                $q['author__not_in'] = array_unique( array_map( 'absint', $q['author__not_in'] ) );
-                                sort( $q['author__not_in'] );
-                        }
-                        $author__not_in = implode( ',', (array) $q['author__not_in'] );
-                        $where         .= " AND {$wpdb->posts}.post_author NOT IN ($author__not_in) ";
+                        $author__not_in_id_list = wp_parse_id_list( $q['author__not_in'] );
+                        if ( count( $author__not_in_id_list ) > 0 ) {
+                                sort( $author__not_in_id_list );
+                                $where .= sprintf(
+                                        " AND {$wpdb->posts}.post_author NOT IN (%s) ",
+                                        implode( ',', $author__not_in_id_list )
+                                );
+                                /** Update the query var for stable cache key generation in {@see self::generate_cache_key()}. */
+                                $q['author__not_in'] = $author__not_in_id_list;
+                        }
                 } elseif ( ! empty( $q['author__in'] ) ) {
                         if ( is_array( $q['author__in'] ) ) {

branches/6.8/src/wp-includes/rest-api.php

@@ -431 +431 @@
         }
 
+        // Short-circuit before define()/die() if a REST dispatch is already in flight.
+        // serve_request() enforces this too; guarding here avoids the trailing die().
+        if ( isset( $GLOBALS['wp_rest_server'] )
+                && $GLOBALS['wp_rest_server'] instanceof WP_REST_Server
+                && $GLOBALS['wp_rest_server']->is_dispatching()
+        ) {
+                return;
+        }
+
         // Return an error message if query_var is not a string.
         if ( ! is_string( $GLOBALS['wp']->query_vars['rest_route'] ) ) {

branches/6.8/src/wp-includes/rest-api/class-wp-rest-server.php

@@ -284 +284 @@
          */
         public function serve_request( $path = null ) {
+                // Refuse to start a fresh top-level REST cycle while another dispatch
+                // is already in flight. Internal sub-requests must use dispatch().
+                if ( $this->is_dispatching() ) {
+                        return false;
+                }
+
                 /* @var WP_User|null $current_user */
                 global $current_user;
@@ -1754 +1760 @@
 
                 foreach ( $requests as $single_request ) {
+                        if ( is_wp_error( $single_request ) ) {
+                                $has_error    = true;
+                                $matches[]    = $single_request;
+                                $validation[] = $single_request;
+                                continue;
+                        }
+
                         $match     = $this->match_request_to_handler( $single_request );
                         $matches[] = $match;