WordPress.org

Make WordPress Core

Changeset 31403


Ignore:
Timestamp:
02/10/2015 07:46:50 AM (5 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:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/includes/ms.php

    r31300 r31403  
    254254    update_option( 'adminhash', $new_admin_email );
    255255
    256     $email_text = __( 'Dear user,
     256    $email_text = __( 'Howdy ###USERNAME###,
    257257
    258258You recently requested to have the administration email address on
    259259your site changed.
     260
    260261If this is correct, please click on the following link to change it:
    261262###ADMIN_URL###
     
    274275     *
    275276     * The following strings have a special meaning and will get replaced dynamically:
     277     * ###USERNAME###  The current user's username.
    276278     * ###ADMIN_URL### The link to click on to confirm the email change. Required otherwise this functunalty is will break.
    277279     * ###EMAIL###     The new email.
     
    286288    $content = apply_filters( 'new_admin_email_content', $email_text, $new_admin_email );
    287289
     290    $content = str_replace( '###USERNAME###', $current_user->user_login, $content );
    288291    $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'options.php?adminhash='.$hash ) ), $content );
    289292    $content = str_replace( '###EMAIL###', $value, $content );
     
    332335        update_option( $current_user->ID . '_new_email', $new_user_email );
    333336
    334         $email_text = __( 'Dear user,
     337        $email_text = __( 'Howdy ###USERNAME###,
    335338
    336339You recently requested to have the email address on your account changed.
     340
    337341If this is correct, please click on the following link to change it:
    338342###ADMIN_URL###
     
    351355         *
    352356         * The following strings have a special meaning and will get replaced dynamically:
     357         * ###USERNAME###  The current user's username.
    353358         * ###ADMIN_URL### The link to click on to confirm the email change. Required otherwise this functunalty is will break.
    354359         * ###EMAIL### The new email.
     
    363368        $content = apply_filters( 'new_user_email_content', $email_text, $new_user_email );
    364369
     370        $content = str_replace( '###USERNAME###', $current_user->user_login, $content );
    365371        $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'profile.php?newuseremail='.$hash ) ), $content );
    366372        $content = str_replace( '###EMAIL###', $_POST['email'], $content);
  • trunk/src/wp-admin/includes/schema.php

    r31349 r31403  
    918918    }
    919919
    920     $welcome_email = __( 'Dear User,
     920    $welcome_email = __( 'Howdy USERNAME,
    921921
    922922Your new SITE_NAME site has been successfully set up at:
  • trunk/src/wp-admin/ms-delete-site.php

    r27801 r31403  
    2727
    2828$blog = get_blog_details();
     29$user = wp_get_current_user();
    2930
    3031$title = __( 'Delete Site' );
     
    4344    $url_delete = esc_url( admin_url( 'ms-delete-site.php?h=' . $hash ) );
    4445
    45     $content = __( "Dear User,
     46    $content = __( "Howdy ###USERNAME###,
     47
    4648You recently clicked the 'Delete Site' link on your site and filled in a
    4749form on that page.
     50
    4851If you really want to delete your site, click the link below. You will not
    4952be asked to confirm again so only click this link if you are absolutely certain:
     
    6669    $content = apply_filters( 'delete_site_email_content', $content );
    6770
     71    $content = str_replace( '###USERNAME###', $user->user_login, $content );
    6872    $content = str_replace( '###URL_DELETE###', $url_delete, $content );
    6973    $content = str_replace( '###SITE_NAME###', $current_site->site_name, $content );
  • trunk/src/wp-includes/ms-functions.php

    r31296 r31403  
    14351435    $welcome_email = get_site_option( 'welcome_email' );
    14361436    if ( $welcome_email == false )
    1437         $welcome_email = __( 'Dear User,
     1437        $welcome_email = __( 'Howdy USERNAME,
    14381438
    14391439Your new SITE_NAME site has been successfully set up at:
     
    20812081    if ( !$text ) {
    20822082        remove_filter( 'site_option_welcome_user_email', 'welcome_user_msg_filter' );
    2083         $text = __( 'Dear User,
     2083        $text = __( 'Howdy USERNAME,
    20842084
    20852085Your new account is set up.
Note: See TracChangeset for help on using the changeset viewer.