Changeset 35659

Timestamp:

11/18/2015 07:23:38 AM (10 years ago)

Author:

rmccue

Message:

REST API: Remove redundant "0" parameter.

This is just an artifact of how we parse the URL, and is already available
via $request->get_route()

Props danielbachhuber.
Fixes #34647.

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

@@ -790 +790 @@
 
                 if ( ! is_wp_error( $response ) ) {
+                    // Remove the redundant preg_match argument.
+                    unset( $args[0] );
 
                     $request->set_url_params( $args );

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

@@ -105 +105 @@
         $this->assertEquals( 200, $response->get_status() );
         $this->assertArrayNotHasKey( 'foo', (array) $request );
+    }
+
+    public function test_no_zero_param() {
+        register_rest_route( 'no-zero', '/test', array(
+            'methods'  => array( 'GET' ),
+            'callback' => '__return_null',
+            'args'     => array(
+                'foo'  => array(
+                    'default'    => 'bar',
+                ),
+            ),
+        ) );
+        $request = new WP_REST_Request( 'GET', '/no-zero/test' );
+        $this->server->dispatch( $request );
+        $this->assertEquals( array( 'foo' => 'bar' ), $request->get_params() );
     }