From a332bb92d2da9f9e919fe357b5de7fb7bb175573 Mon Sep 17 00:00:00 2001 From: Rachel Baker Date: Thu, 1 Dec 2016 03:06:33 +0000 Subject: [PATCH] REST API: Correct the admin_email setting description for single site installs. Display different descriptions for multisite or single site installations. Props johnbillion, ocean90. Merges [39406] to the 4.7 branch. Fixes #38990 for 4.7 Built from https://develop.svn.wordpress.org/branches/4.7@39407 git-svn-id: http://core.svn.wordpress.org/branches/4.7@39347 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/option.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/option.php b/wp-includes/option.php index 05c6cc7421..aa98477417 100644 --- a/wp-includes/option.php +++ b/wp-includes/option.php @@ -1756,7 +1756,7 @@ function register_initial_settings() { ), ), 'type' => 'string', - 'description' => __( '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.' ), + '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.' ), ) ); register_setting( 'general', 'timezone_string', array( diff --git a/wp-includes/version.php b/wp-includes/version.php index 60f7f1e824..778c1d6cec 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-RC1-39405'; +$wp_version = '4.7-RC1-39407'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.