Options, Meta APIs: Account for URL query parameters when checking the validity of requests to the /wp/v2/settings REST API route.

Follow-up to [60301].

Props sheldorofazeroth, Mamaduka, wildworks, johnbillion

Fixes #41604

git-svn-id: https://develop.svn.wordpress.org/trunk@60357 602fd350-edb4-49c9-b593-d223f7449a82

Author: johnbillion

src/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php

@@ -145,7 +145,7 @@ protected function prepare_value( $value, $schema ) {
 	public function update_item( $request ) {
 		$options = $this->get_registered_options();
 
-		$params = $request->get_params();
+		$params = array_diff_key( $request->get_params(), $request->get_query_params() );
 
 		if ( empty( $params ) || ! empty( array_diff_key( $params, $options ) ) ) {
 			$message = empty( $params )

tests/phpunit/tests/rest-api/rest-settings-controller.php

@@ -397,6 +397,9 @@ public function test_create_item() {
 		$this->assertSame( 400, $response->get_status() );
 	}
 
+	/**
+	 * @ticket 41604
+	 */
 	public function test_update_item() {
 		wp_set_current_user( self::$administrator );
 
@@ -410,6 +413,39 @@ public function test_update_item() {
 		$this->assertSame( get_option( 'blogname' ), $data['title'] );
 	}
 
+	/**
+	 * @ticket 41604
+	 */
+	public function test_update_item_with_global_parameters_present() {
+		wp_set_current_user( self::$administrator );
+
+		$request = new WP_REST_Request( 'PUT', '/wp/v2/settings' );
+		$request->set_param( 'title', 'The new title!' );
+		$request->set_url_params( array( '_locale' => 'user' ) );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 200, $response->get_status() );
+		$this->assertSame( 'The new title!', $data['title'] );
+		$this->assertSame( get_option( 'blogname' ), $data['title'] );
+	}
+
+	/**
+	 * @ticket 41604
+	 */
+	public function test_update_item_with_empty_body() {
+		wp_set_current_user( self::$administrator );
+
+		$request  = new WP_REST_Request( 'PUT', '/wp/v2/settings' );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 400, $response->get_status() );
+	}
+
+	/**
+	 * @ticket 41604
+	 */
 	public function test_update_nonexistent_item() {
 		wp_set_current_user( self::$administrator );
 
@@ -420,6 +456,9 @@ public function test_update_nonexistent_item() {
 		$this->assertSame( 400, $response->get_status() );
 	}
 
+	/**
+	 * @ticket 41604
+	 */
 	public function test_update_partially_valid_items() {
 		wp_set_current_user( self::$administrator );