Changeset 36535

Timestamp:

02/16/2016 05:50:21 AM (9 years ago)

Author:

rmccue

Message:

REST API: Allow explicit HEAD callbacks.

HEAD callbacks can now be registered independently, with the GET
callback still used as a fallback.

Fixes #34841.

Location:

trunk

Files:

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

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

@@ -821 +821 @@
                 $response = null;
 
-                $checked_method = 'HEAD' === $method ? 'GET' : $method;
+                // Fallback to GET method if no HEAD method is registered.
+                $checked_method = $method;
+                if ( 'HEAD' === $method && empty( $handler['methods']['HEAD'] ) ) {
+                    $checked_method = 'GET';
+                }
                 if ( empty( $handler['methods'][ $checked_method ] ) ) {
                     continue;

trunk/tests/phpunit/tests/rest-api/rest-server.php

@@ -140 +140 @@
 
     /**
+     * Plugins should be able to register explicit HEAD callbacks before the
+     * GET callback.
+     *
+     * @depends test_head_request_handled_by_get
+     */
+    public function test_explicit_head_callback() {
+        register_rest_route( 'head-request', '/test', array(
+            array(
+                'methods' => array( 'HEAD' ),
+                'callback' => '__return_true',
+            ),
+            array(
+                'methods' => array( 'GET' ),
+                'callback' => '__return_false',
+                'permission_callback' => array( $this, 'permission_denied' ),
+            ),
+        ));
+        $request = new WP_REST_Request( 'HEAD', '/head-request/test' );
+        $response = $this->server->dispatch( $request );
+        $this->assertEquals( 200, $response->get_status() );
+    }
+
+    /**
      * Pass a capability which the user does not have, this should
      * result in a 403 error.