Changeset 39468

Timestamp:

12/03/2016 05:15:42 AM (8 years ago)

Author:

pento

Message:

REST API: Site URL setting should not be present on multisite installations.

The siteurl setting is registered and made available to the REST API. On a multisite installation, this setting is not configurable from the General Settings screen, but due to the above it is configurable from the REST API.

Props peterwilsoncc.
Fixes #39005.

Location:

trunk

Files:

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

trunk/src/wp-includes/option.php

@@ -1738 +1738 @@
     ) );
 
-    register_setting( 'general', 'siteurl', array(
-        'show_in_rest' => array(
-            'name'    => 'url',
-            'schema'  => array(
-                'format' => 'uri',
+    if ( ! is_multisite() ) {
+        register_setting( 'general', 'siteurl', array(
+            'show_in_rest' => array(
+                'name'    => 'url',
+                'schema'  => array(
+                    'format' => 'uri',
+                ),
             ),
-        ),
-        'type'         => 'string',
-        'description'  => __( 'Site URL.' ),
-    ) );
+            'type'         => 'string',
+            'description'  => __( 'Site URL.' ),
+        ) );
+    }
 
     register_setting( 'general', 'admin_email', array(

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

@@ -50 +50 @@
         $response = $this->server->dispatch( $request );
         $data = $response->get_data();
-
-        $this->assertEquals( 200, $response->get_status() );
-        $this->assertEquals( array(
+        $actual = array_keys( $data );
+
+        $expected = array(
             'title',
             'description',
@@ -68 +68 @@
             'default_ping_status',
             'default_comment_status',
-        ), array_keys( $data ) );
+        );
+
+        if ( is_multisite() ) {
+            $expected = array_diff( $expected, array( 'url' ) );
+        }
+
+        sort( $expected );
+        sort( $actual );
+
+        $this->assertEquals( 200, $response->get_status() );
+        $this->assertEquals( $expected, $actual );
     }