WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Users: Add the new email address to the email address change notification email. 

Fixes #39112

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


git-svn-id: http://core.svn.wordpress.org/trunk@41006 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2017-07-27 02:57:43 +00:00
parent 30d5450508
commit ff20054573
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/user.php
View File

@ -1899,7 +1899,7 @@ All at ###SITENAME###
* The following strings have a special meaning and will get replaced dynamically: * The following strings have a special meaning and will get replaced dynamically:
* - ###USERNAME### The current user's username. * - ###USERNAME### The current user's username.
* - ###ADMIN_EMAIL### The admin email in case this was unexpected. * - ###ADMIN_EMAIL### The admin email in case this was unexpected.
* - ###EMAIL### The old email. * - ###EMAIL### The user's email address.
* - ###SITENAME### The name of the site. * - ###SITENAME### The name of the site.
* - ###SITEURL### The URL to the site. * - ###SITEURL### The URL to the site.
* @type string $headers Headers. Add headers in a newline (\r\n) separated string. * @type string $headers Headers. Add headers in a newline (\r\n) separated string.
@ -1920,10 +1920,10 @@ All at ###SITENAME###
} }
if ( ! empty( $send_email_change_email ) ) { if ( ! empty( $send_email_change_email ) ) {
/* translators: Do not translate USERNAME, ADMIN_EMAIL, EMAIL, SITENAME, SITEURL: those are placeholders. */ /* translators: Do not translate USERNAME, ADMIN_EMAIL, NEW_EMAIL, EMAIL, SITENAME, SITEURL: those are placeholders. */
$email_change_text = __( 'Hi ###USERNAME###, $email_change_text = __( 'Hi ###USERNAME###,
This notice confirms that your email was changed on ###SITENAME###. This notice confirms that your email address on ###SITENAME### was changed to ###NEW_EMAIL###.
If you did not change your email, please contact the Site Administrator at If you did not change your email, please contact the Site Administrator at
###ADMIN_EMAIL### ###ADMIN_EMAIL###
@ -1955,7 +1955,8 @@ All at ###SITENAME###
* The following strings have a special meaning and will get replaced dynamically: * The following strings have a special meaning and will get replaced dynamically:
* - ###USERNAME### The current user's username. * - ###USERNAME### The current user's username.
* - ###ADMIN_EMAIL### The admin email in case this was unexpected. * - ###ADMIN_EMAIL### The admin email in case this was unexpected.
* - ###EMAIL### The old email. * - ###NEW_EMAIL### The new email address.
* - ###EMAIL### The old email address.
* - ###SITENAME### The name of the site. * - ###SITENAME### The name of the site.
* - ###SITEURL### The URL to the site. * - ###SITEURL### The URL to the site.
* @type string $headers Headers. * @type string $headers Headers.
@ -1967,6 +1968,7 @@ All at ###SITENAME###
$email_change_email['message'] = str_replace( '###USERNAME###', $user['user_login'], $email_change_email['message'] ); $email_change_email['message'] = str_replace( '###USERNAME###', $user['user_login'], $email_change_email['message'] );
$email_change_email['message'] = str_replace( '###ADMIN_EMAIL###', get_option( 'admin_email' ), $email_change_email['message'] ); $email_change_email['message'] = str_replace( '###ADMIN_EMAIL###', get_option( 'admin_email' ), $email_change_email['message'] );
$email_change_email['message'] = str_replace( '###NEW_EMAIL###', $userdata['user_email'], $email_change_email['message'] );
$email_change_email['message'] = str_replace( '###EMAIL###', $user['user_email'], $email_change_email['message'] ); $email_change_email['message'] = str_replace( '###EMAIL###', $user['user_email'], $email_change_email['message'] );
$email_change_email['message'] = str_replace( '###SITENAME###', $blog_name, $email_change_email['message'] ); $email_change_email['message'] = str_replace( '###SITENAME###', $blog_name, $email_change_email['message'] );
$email_change_email['message'] = str_replace( '###SITEURL###', home_url(), $email_change_email['message'] ); $email_change_email['message'] = str_replace( '###SITEURL###', home_url(), $email_change_email['message'] );

2
wp-includes/version.php
View File

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