Changeset 62772

Timestamp:

07/17/2026 04:27:15 PM (2 months ago)

Author:

desrosj

Message:

REST API: sub-requests must always use dispatch.

Merges [62769] to the 7.0 branch.

Props xknown, johnbillion, joehoyle, jorbin, sergeybiryukov, ehtis, desrosj.

Location:

branches/7.0

Files:

• . (modified) (1 prop)
• src/wp-includes/rest-api.php (modified) (1 diff)
• src/wp-includes/rest-api/class-wp-rest-server.php (modified) (1 diff)

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

@@ -443 +443 @@
         }
 
+        // 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/7.0/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;