Changeset 39087

Timestamp:

11/02/2016 05:52:12 AM (8 years ago)

Author:

rmccue

Message:

REST API: Change method of merging parameters.

array_merge() incorrectly reindexes numeric parameters, causing things like {"123": true} to be "dropped".

Props sswells, joehoyle.
Fixes #38306.

Location:

trunk

Files:

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

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

@@ -452 +452 @@
         $params = array();
         foreach ( $order as $type ) {
-            $params = array_merge( $params, (array) $this->params[ $type ] );
+            // array_merge / the "+" operator will mess up
+            // numeric keys, so instead do a manual foreach.
+            foreach ( (array) $this->params[ $type ] as $key => $value ) {
+                $params[ $key ] = $value;
+            }
         }
 

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

@@ -283 +283 @@
             'has_body_params'    => true,
             'has_default_params' => true,
+        );
+        $this->assertEquals( $expected, $this->request->get_params() );
+    }
+
+    public function test_parameter_merging_with_numeric_keys() {
+        $this->request->set_query_params( array(
+            '1'           => 'hello',
+            '2'           => 'goodbye',
+        ) );
+        $expected = array(
+            '1'           => 'hello',
+            '2'           => 'goodbye',
         );
         $this->assertEquals( $expected, $this->request->get_params() );