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

Timestamp:

04/09/2020 07:28:58 PM (11 months ago)

Author:

kadamwhite

Message:

REST API: Handle parameter types consistently within set_param().

A request has multiple parameter types, including "query" and "json." Updating a parameter could previously modify a key's value in the wrong parameter type, leading to confusing and self-contradictory response objects.

Props mnelson4, TimothyBlynJacobs, vagios, jnylen0.
Fixes #40838.

File:

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

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

@@ -421 +421 @@
      * Sets a parameter on the request.
      *
+     * If the given parameter key exists in any parameter type an update will take place,
+     * otherwise a new param will be created in the first parameter type (respecting
+     * get_parameter_order()).
+     *
      * @since 4.4.0
      *
@@ -427 +431 @@
      */
     public function set_param( $key, $value ) {
-        $order                             = $this->get_parameter_order();
-        $this->params[ $order[0] ][ $key ] = $value;
+        $order     = $this->get_parameter_order();
+        $found_key = false;
+
+        foreach ( $order as $type ) {
+            if ( 'defaults' !== $type && array_key_exists( $key, $this->params[ $type ] ) ) {
+                $this->params[ $type ][ $key ] = $value;
+                $found_key                     = true;
+            }
+        }
+
+        if ( ! $found_key ) {
+            $this->params[ $order[0] ][ $key ] = $value;
+        }
     }