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

Timestamp:

05/23/2020 02:34:38 PM (5 years ago)

Author:

ocean90

Message:

Rest API: Ensure rest_ensure_response() upgrades WP_HTTP_Response to WP_REST_Response.

An instance of WP_HTTP_Response doesn't ensure that the required methods used in WP_REST_Server::dispatch() exist, currently causing a fatal error.

Props ali11007, TimothyBlynJacobs, ocean90.
Fixes #49495.

File:

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

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

@@ -970 +970 @@
                  * @since 4.7.0
                  *
-                 * @param WP_HTTP_Response|WP_Error $response Result to send to the client. Usually a WP_REST_Response or WP_Error.
-                 * @param array                     $handler  Route handler used for the request.
-                 * @param WP_REST_Request           $request  Request used to generate the response.
+                 * @param WP_REST_Response|WP_HTTP_Response|WP_Error|mixed $response Result to send to the client. Usually a WP_REST_Response or WP_Error.
+                 * @param array                                            $handler  Route handler used for the request.
+                 * @param WP_REST_Request                                  $request  Request used to generate the response.
                  */
                 $response = apply_filters( 'rest_request_before_callbacks', $response, $handler, $request );
@@ -1033 +1033 @@
                  * @since 4.7.0
                  *
-                 * @param WP_HTTP_Response|WP_Error $response Result to send to the client. Usually a WP_REST_Response or WP_Error.
-                 * @param array                     $handler  Route handler used for the request.
-                 * @param WP_REST_Request           $request  Request used to generate the response.
+                 * @param WP_REST_Response|WP_HTTP_Response|WP_Error|mixed $response Result to send to the client. Usually a WP_REST_Response or WP_Error.
+                 * @param array                                            $handler  Route handler used for the request.
+                 * @param WP_REST_Request                                  $request  Request used to generate the response.
                  */
                 $response = apply_filters( 'rest_request_after_callbacks', $response, $handler, $request );