Changeset 60357

Timestamp:

06/27/2025 02:25:07 PM (15 months ago)

Author:

johnbillion

Message:

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

Location:

trunk

Files:

• src/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php (modified) (1 diff)
• tests/phpunit/tests/rest-api/rest-settings-controller.php (modified) (3 diffs)

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

@@ -146 +146 @@
                 $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 ) ) ) {

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

@@ -398 +398 @@
         }
 
+        /**
+         * @ticket 41604
+         */
         public function test_update_item() {
                 wp_set_current_user( self::$administrator );
@@ -411 +414 @@
         }
 
+        /**
+         * @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 );
@@ -421 +457 @@
         }
 
+        /**
+         * @ticket 41604
+         */
         public function test_update_partially_valid_items() {
                 wp_set_current_user( self::$administrator );