From 1448bfc96f0e5f401fa3cad5cbbe7cf8c44bafd6 Mon Sep 17 00:00:00 2001 From: Rachel Baker Date: Thu, 1 Dec 2016 03:03:43 +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. Fixes #38990. Built from https://develop.svn.wordpress.org/trunk@39406 git-svn-id: http://core.svn.wordpress.org/trunk@39346 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 ef0dd5b483..748ac986ec 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.8-alpha-39404'; +$wp_version = '4.8-alpha-39406'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.