Changeset 41166

Timestamp:

07/27/2017 02:56:46 AM (3 years ago)

Author:

johnbillion

Message:

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

Fixes #39112

File:

• trunk/src/wp-includes/user.php (modified) (4 diffs)

trunk/src/wp-includes/user.php

@@ -1900 +1900 @@
              *                - ###USERNAME###    The current user's username.
              *                - ###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.
              *                - ###SITEURL###     The URL to the site.
@@ -1921 +1921 @@
 
         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###,
 
-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
@@ -1956 +1956 @@
              *                - ###USERNAME###    The current user's username.
              *                - ###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.
              *                - ###SITEURL###     The URL to the site.
@@ -1968 +1969 @@
             $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( '###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( '###SITENAME###', $blog_name, $email_change_email['message'] );