Ticket #43706: 43706.1.patch

src/wp-admin/includes/misc.php

@@ -1353 +1353 @@
 
         $switched_locale = switch_to_locale( get_user_locale() );
 
-        /* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
+        /* translators: Do not translate USERNAME, ADMIN_URL, OLD_EMAIL, NEW_EMAIL, SITENAME, SITEURL: those are placeholders. */
         $email_text = __(
-                'Howdy ###USERNAME###,
+                'Howdy,
 
-You recently requested to have the administration email address on
-your site changed.
+The user \'###USERNAME###\' recently requested to have the administration
+email address on your site changed to ###NEW_EMAIL###.
+
+The previous email address is ###OLD_EMAIL###.
 
 If this is correct, please click on the following link to change it:
 ###ADMIN_URL###
@@ -1366 +1368 @@
 You can safely ignore and delete this email if you do not want to
 take this action.
 
-This email has been sent to ###EMAIL###
-
 Regards,
 All at ###SITENAME###
 ###SITEURL###'
@@ -1379 +1379 @@
          * The following strings have a special meaning and will get replaced dynamically:
          * ###USERNAME###  The current user's username.
          * ###ADMIN_URL### The link to click on to confirm the email change.
-         * ###EMAIL###     The proposed new site admin email address.
+         * ###OLD_EMAIL### The old site admin email address.
+         * ###NEW_EMAIL### The proposed new site admin email address.
          * ###SITENAME###  The name of the site.
          * ###SITEURL###   The URL to the site.
          *
@@ -1399 +1400 @@
         $current_user = wp_get_current_user();
         $content      = str_replace( '###USERNAME###', $current_user->user_login, $content );
         $content      = str_replace( '###ADMIN_URL###', esc_url( self_admin_url( 'options.php?adminhash=' . $hash ) ), $content );
-        $content      = str_replace( '###EMAIL###', $value, $content );
+        $content      = str_replace( '###OLD_EMAIL###', $old_value, $content );
+        $content      = str_replace( '###NEW_EMAIL###', $value, $content );
         $content      = str_replace( '###SITENAME###', wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ), $content );
         $content      = str_replace( '###SITEURL###', home_url(), $content );