From e97d2c04079e88b2aa3e321e49ab20aa220d527f Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sun, 11 Feb 2018 12:23:31 +0000
Subject: [PATCH] Users: After [41163], add a notice for Email field on Profile
 screen that the new address will not become active until confirmed.

Props dilipbheda.
Fixes #43106. See #16470.
Built from https://develop.svn.wordpress.org/trunk@42688


git-svn-id: http://core.svn.wordpress.org/trunk@42516 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/user-edit.php  | 10 +++++++++-
 wp-includes/version.php |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index 7e443c42c3..955a82a998 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -485,8 +485,16 @@ if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_c
 	<table class="form-table">
 	<tr class="user-email-wrap">
 		<th><label for="email"><?php _e( 'Email' ); ?> <span class="description"><?php _e( '(required)' ); ?></span></label></th>
-		<td><input type="email" name="email" id="email" value="<?php echo esc_attr( $profileuser->user_email ); ?>" class="regular-text ltr" />
+		<td><input type="email" name="email" id="email" aria-describedby="email-description" value="<?php echo esc_attr( $profileuser->user_email ); ?>" class="regular-text ltr" />
 		<?php
+		if ( $profileuser->ID == $current_user->ID ) :
+		?>
+		<p class="description" id="email-description">
+			<?php _e( 'If you change this we will send you an email at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ); ?>
+		</p>
+		<?php
+		endif;
+
 		$new_email = get_user_meta( $current_user->ID, '_new_email', true );
 		if ( $new_email && $new_email['newemail'] != $current_user->user_email && $profileuser->ID == $current_user->ID ) :
 		?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d33fa41ee9..7111a7cf03 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-42687';
+$wp_version = '5.0-alpha-42688';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.