Changeset 55361 for trunk/src/wp-includes/rest-api/class-wp-rest-server.php

Timestamp:

02/17/2023 03:43:47 PM (2 years ago)

Author:

TimothyBlynJacobs

Message:

REST API: Normalize WP_REST_Server::dispatch() to return a response object.

Previously, the rest_pre_dispatch filter could be used to return a WP_Error instance. This would cause a fatal error for rest_post_dispath
filters that were rightly expecting a WP_REST_Response object to be passed instead.

Props DaveFX, felipeelia.
Fixes #56566.

File:

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

trunk/src/wp-includes/rest-api/class-wp-rest-server.php

@@ -985 +985 @@
 
         if ( ! empty( $result ) ) {
+
+            // Normalize to either WP_Error or WP_REST_Response...
+            $result = rest_ensure_response( $result );
+
+            // ...then convert WP_Error across.
+            if ( is_wp_error( $result ) ) {
+                $result = $this->error_to_response( $result );
+            }
+
             return $result;
         }