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

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

fixes #38990.

Built from https://develop.svn.wordpress.org/branches/4.7@39472


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39412 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-includes/option.php

@@ -1750,16 +1750,18 @@ function register_initial_settings() {
 		) );
 	}
 
-	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(
 		'show_in_rest' => array(

wp-includes/version.php

@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-RC1-39469';
+$wp_version = '4.7-RC1-39472';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.