Changeset 31403

Timestamp:

02/10/2015 07:46:50 AM (9 years ago)

Author:

SergeyBiryukov

Message:

Replace generic "Dear user" greeting in email notifications with a more personalized one.

props Ipstenu.
fixes #31217.

Location:

trunk/src

Files:

• wp-admin/includes/ms.php (modified) (6 diffs)
• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/ms-delete-site.php (modified) (3 diffs)
• wp-includes/ms-functions.php (modified) (2 diffs)

trunk/src/wp-admin/includes/ms.php

@@ -254 +254 @@
     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###
@@ -274 +275 @@
      *
      * 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. Required otherwise this functunalty is will break.
      * ###EMAIL###     The new email.
@@ -286 +288 @@
     $content = apply_filters( 'new_admin_email_content', $email_text, $new_admin_email );
 
+    $content = str_replace( '###USERNAME###', $current_user->user_login, $content );
     $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'options.php?adminhash='.$hash ) ), $content );
     $content = str_replace( '###EMAIL###', $value, $content );
@@ -332 +335 @@
         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:
 ###ADMIN_URL###
@@ -351 +355 @@
          *
          * 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. Required otherwise this functunalty is will break.
          * ###EMAIL### The new email.
@@ -363 +368 @@
         $content = apply_filters( 'new_user_email_content', $email_text, $new_user_email );
 
+        $content = str_replace( '###USERNAME###', $current_user->user_login, $content );
         $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'profile.php?newuseremail='.$hash ) ), $content );
         $content = str_replace( '###EMAIL###', $_POST['email'], $content);

trunk/src/wp-admin/includes/schema.php

@@ -918 +918 @@
     }
 
-    $welcome_email = __( 'Dear User,
+    $welcome_email = __( 'Howdy USERNAME,
 
 Your new SITE_NAME site has been successfully set up at:

trunk/src/wp-admin/ms-delete-site.php

@@ -27 +27 @@
 
 $blog = get_blog_details();
+$user = wp_get_current_user();
 
 $title = __( 'Delete Site' );
@@ -43 +44 @@
     $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:
@@ -66 +69 @@
     $content = apply_filters( 'delete_site_email_content', $content );
 
+    $content = str_replace( '###USERNAME###', $user->user_login, $content );
     $content = str_replace( '###URL_DELETE###', $url_delete, $content );
     $content = str_replace( '###SITE_NAME###', $current_site->site_name, $content );

trunk/src/wp-includes/ms-functions.php

@@ -1435 +1435 @@
     $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:
@@ -2081 +2081 @@
     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.