Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-03 14:11:25 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.

Built from https://develop.svn.wordpress.org/trunk@47559


git-svn-id: http://core.svn.wordpress.org/trunk@47334 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
K. Adam White 2020-04-09 19:30:07 +00:00
parent f927fdedb4
commit 951b1d89db
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wp-includes/rest-api/class-wp-rest-request.php
View File

@ -420,14 +420,29 @@ class WP_REST_Request implements ArrayAccess {
/** /**
* Sets a parameter on the request. * 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 * @since 4.4.0
* *
* @param string $key Parameter name. * @param string $key Parameter name.
* @param mixed $value Parameter value. * @param mixed $value Parameter value.
*/ */
public function set_param( $key, $value ) { public function set_param( $key, $value ) {
$order = $this->get_parameter_order(); $order = $this->get_parameter_order();
$this->params[ $order[0] ][ $key ] = $value; $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;
}
} }
/** /**

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.5-alpha-47558'; $wp_version = '5.5-alpha-47559';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.