Changeset 39472

Timestamp:

12/03/2016 05:41:52 AM (8 years ago)

Author:

nacin

Message:

REST API: Register the admin_email setting in single site only.

Merges [39470] and [39471] to the 4.7 branch.

fixes #38990.

Location:

branches/4.7

Files:

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

branches/4.7/src/wp-includes/option.php

@@ -1751 +1751 @@
     }
 
-    register_setting( 'general', 'admin_email', array(
-        'show_in_rest' => array(
-            'name'    => 'email',
-            'schema'  => array(
-                'format' => 'email',
+    if ( ! is_multisite() ) {
+        register_setting( 'general', 'admin_email', array(
+            'show_in_rest' => array(
+                'name'    => 'email',
+                'schema'  => array(
+                    'format' => 'email',
+                ),
             ),
-        ),
-        'type'         => 'string',
-        'description'  => is_multisite() ? __( 'This address is used for admin purposes. If you change this we will send you an email at your new address to confirm it. The new address will not become active until confirmed.' ) : __( 'This address is used for admin purposes, like new user notification.' ),
-    ) );
+            'type'         => 'string',
+            'description'  => __( 'This address is used for admin purposes, like new user notification.' ),
+        ) );
+    }
 
     register_setting( 'general', 'timezone_string', array(

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

@@ -55 +55 @@
             'title',
             'description',
-            'url',
-            'email',
             'timezone',
             'date_format',
@@ -70 +68 @@
         );
 
-        if ( is_multisite() ) {
-            $expected = array_diff( $expected, array( 'url' ) );
+        if ( ! is_multisite() ) {
+            $expected[] = 'url';
+            $expected[] = 'email';
         }