Ticket #31217: 31217.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:
@@ -351 +354 @@
                  *
                  * The following strings have a special meaning and will get replaced dynamically:
                  * ###ADMIN_URL### The link to click on to confirm the email change. Required otherwise this functunalty is will break.
-                 * ###EMAIL### The new email.
-                 * ###SITENAME### The name of the site.
-                 * ###SITEURL### The URL to the site.
+                 * ###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;

wp-admin/includes/schema.php

@@ -917 +917 @@
                 $site_admins = get_site_option( 'site_admins' );
         }
 
-        $welcome_email = __( 'Dear User,
+        $welcome_email = __( 'Howdy USERNAME,
 
 Your new SITE_NAME site has been successfully set up at:
 BLOG_URL

wp-admin/ms-delete-site.php

@@ -26 +26 @@
 }
 
 $blog = get_blog_details();
+$user = wp_get_current_user();
 
 $title = __( 'Delete Site' );
 $parent_file = 'tools.php';
@@ -42 +43 @@
 
         $url_delete = esc_url( admin_url( 'ms-delete-site.php?h=' . $hash ) );
 
-        $content = __( "Dear User,
+        $content = __( "Howdy ###USERNAME###,
+        
 You recently clicked the 'Delete Site' link on your site and filled in a
 form on that page.
+
 If you really want to delete your site, click the link below. You will not
 be asked to confirm again so only click this link if you are absolutely certain:
 ###URL_DELETE###
@@ -55 +58 @@
 
 Thanks for using the site,
 Webmaster
+
 ###SITE_NAME###" );
         /**
          * Filter the email content sent when a site in a Multisite network is deleted.
@@ -67 +71 @@
 
         $content = str_replace( '###URL_DELETE###', $url_delete, $content );
         $content = str_replace( '###SITE_NAME###', $current_site->site_name, $content );
+        $content = str_replace( '###USERNAME###', $user->user_login, $content );
 
         wp_mail( get_option( 'admin_email' ), "[ " . wp_specialchars_decode( get_option( 'blogname' ) ) . " ] ".__( 'Delete My Site' ), $content );
         ?>

wp-includes/ms-functions.php

@@ -1434 +1434 @@
 
         $welcome_email = get_site_option( 'welcome_email' );
         if ( $welcome_email == false )
-                $welcome_email = __( 'Dear User,
+                $welcome_email = __( 'Howdy USERNAME,
 
 Your new SITE_NAME site has been successfully set up at:
 BLOG_URL
@@ -2080 +2080 @@
 function welcome_user_msg_filter( $text ) {
         if ( !$text ) {
                 remove_filter( 'site_option_welcome_user_email', 'welcome_user_msg_filter' );
-                $text = __( 'Dear User,
+                $text = __( 'Howdy USERNAME,
 
 Your new account is set up.