Changeset 44933 for trunk/src/wp-includes/rest-api.php

Timestamp:

03/19/2019 03:21:28 AM (6 years ago)

Author:

kadamwhite

Message:

REST API: Ensure "Allow" header is returned for OPTIONS requests.

This changeset ensures $request->set_url_params() is called while fulfilling OPTIONS requests, where previously it was skipped because OPTIONS requests short-circuit the logic in dispatch which handles this setup for other request methods. Omitting the URL parameters prevented the Allow header from being set.

Props killua99, noisysocks.
Fixes #45753.

File:

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

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

@@ -616 +616 @@
 
     foreach ( $handler->get_routes() as $route => $endpoints ) {
-        $match = preg_match( '@^' . $route . '$@i', $request->get_route() );
+        $match = preg_match( '@^' . $route . '$@i', $request->get_route(), $matches );
 
         if ( ! $match ) {
             continue;
+        }
+
+        $args = array();
+        foreach ( $matches as $param => $value ) {
+            if ( ! is_int( $param ) ) {
+                $args[ $param ] = $value;
+            }
+        }
+
+        foreach ( $endpoints as $endpoint ) {
+            // Remove the redundant preg_match argument.
+            unset( $args[0] );
+
+            $request->set_url_params( $args );
+            $request->set_attributes( $endpoint );
         }