WordPress.org
Get WordPress

Make WordPress Core

Ticket #39112: 39112.diff

File 39112.diff, 2.8 KB (added by johnbillion, 7 years ago)

  • src/wp-includes/user.php 

    diff --git src/wp-includes/user.php src/wp-includes/user.php
index d27bbda392..9190d9ba24 100644
    All at ###SITENAME### 
    18991899                         *                The following strings have a special meaning and will get replaced dynamically:
    19001900                         *                - ###USERNAME###    The current user's username.
    19011901                         *                - ###ADMIN_EMAIL### The admin email in case this was unexpected.
    1902                          *                - ###EMAIL###       The old email.
     1902                         *                - ###EMAIL###       The user's email address.
    19031903                         *                - ###SITENAME###    The name of the site.
    19041904                         *                - ###SITEURL###     The URL to the site.
    19051905                         *            @type string $headers Headers. Add headers in a newline (\r\n) separated string.
    … … All at ###SITENAME### 
    19201920                }
    19211921
    19221922                if ( ! empty( $send_email_change_email ) ) {
    1923                         /* translators: Do not translate USERNAME, ADMIN_EMAIL, EMAIL, SITENAME, SITEURL: those are placeholders. */
     1923                        /* translators: Do not translate USERNAME, ADMIN_EMAIL, NEW_EMAIL, EMAIL, SITENAME, SITEURL: those are placeholders. */
    19241924                        $email_change_text = __( 'Hi ###USERNAME###,
    19251925
    1926 This notice confirms that your email was changed on ###SITENAME###.
     1926This notice confirms that your email address on ###SITENAME### was changed to ###NEW_EMAIL###.
    19271927
    19281928If you did not change your email, please contact the Site Administrator at
    19291929###ADMIN_EMAIL###
    … … All at ###SITENAME### 
    19551955                         *                The following strings have a special meaning and will get replaced dynamically:
    19561956                         *                - ###USERNAME###    The current user's username.
    19571957                         *                - ###ADMIN_EMAIL### The admin email in case this was unexpected.
    1958                          *                - ###EMAIL###       The old email.
     1958                         *                - ###NEW_EMAIL###   The new email address.
     1959                         *                - ###EMAIL###       The old email address.
    19591960                         *                - ###SITENAME###    The name of the site.
    19601961                         *                - ###SITEURL###     The URL to the site.
    19611962                         *            @type string $headers Headers.
    … … All at ###SITENAME### 
    19671968
    19681969                        $email_change_email['message'] = str_replace( '###USERNAME###', $user['user_login'], $email_change_email['message'] );
    19691970                        $email_change_email['message'] = str_replace( '###ADMIN_EMAIL###', get_option( 'admin_email' ), $email_change_email['message'] );
     1971                        $email_change_email['message'] = str_replace( '###NEW_EMAIL###', $userdata['user_email'], $email_change_email['message'] );
    19701972                        $email_change_email['message'] = str_replace( '###EMAIL###', $user['user_email'], $email_change_email['message'] );
    19711973                        $email_change_email['message'] = str_replace( '###SITENAME###', $blog_name, $email_change_email['message'] );
    19721974                        $email_change_email['message'] = str_replace( '###SITEURL###', home_url(), $email_change_email['message'] );