Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 17:48:01 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
fixes #38990.

Built from https://develop.svn.wordpress.org/trunk@39470


git-svn-id: http://core.svn.wordpress.org/trunk@39410 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2016-12-03 05:39:42 +00:00
parent d7e0ae883c
commit cafb341db6
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wp-includes/option.php
View File

@ -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(

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.8-alpha-39468';
$wp_version = '4.8-alpha-39470';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.