Changeset 62775 for branches/6.9/src/wp-includes/rest-api.php

Timestamp:

07/17/2026 04:36:42 PM (2 months ago)

Author:

desrosj

Message:

Grouped backports to the 6.9 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.9 branch.

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

File:

• branches/6.9/src/wp-includes/rest-api.php (modified) (1 diff)

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

@@ -439 +439 @@
         }
 
+        // 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'] ) ) {