Ticket #31217: 31217-ms.diff

wp-admin/includes/ms.php

@@ -253 +253 @@
         );
         update_option( 'adminhash', $new_admin_email );
 
-        $email_text = __( 'Dear user,
+        $email_text = __( 'Howdy ###USERNAME###,
 
 You recently requested to have the administration email address on
 your site changed.
+
 If this is correct, please click on the following link to change it:
 ###ADMIN_URL###
 
@@ -277 +278 @@
          * ###EMAIL###     The new email.
          * ###SITENAME###  The name of the site.
          * ###SITEURL###   The URL to the site.
+         * ###USERNAME### The current user's username.
          *
          * @since MU
          *
@@ -289 +291 @@
         $content = str_replace( '###EMAIL###', $value, $content );
         $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content );
         $content = str_replace( '###SITEURL###', network_home_url(), $content );
+        $content = str_replace( '###USERNAME###', $current_user->user_login, $content );
 
         wp_mail( $value, sprintf( __( '[%s] New Admin Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content );
 }
@@ -331 +334 @@
                                 );
                 update_option( $current_user->ID . '_new_email', $new_user_email );
 
-                $email_text = __( 'Dear user,
+                $email_text = __( 'Howdy ###USERNAME###,
 
 You recently requested to have the email address on your account changed.
 If this is correct, please click on the following link to change it:
@@ -354 +357 @@
                  * ###EMAIL### The new email.
                  * ###SITENAME### The name of the site.
                  * ###SITEURL### The URL to the site.
+                 * ###USERNAME### The current user's username.
                  *
                  * @since MU
                  *
@@ -366 +370 @@
                 $content = str_replace( '###EMAIL###', $_POST['email'], $content);
                 $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content );
                 $content = str_replace( '###SITEURL###', network_home_url(), $content );
+                $content = str_replace( '###USERNAME###', $current_user->user_login, $content );
 
                 wp_mail( $_POST['email'], sprintf( __( '[%s] New Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content );
                 $_POST['email'] = $current_user->user_email;