WordPress.org

Make WordPress Core

Changeset 36306


Ignore:
Timestamp:
01/15/2016 07:28:48 AM (4 years ago)
Author:
swissspidy
Message:

Users: Decode special characters in password and email change notification emails.

Fixes #35283.

File:
1 edited

Legend:

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

    r36246 r36306  
    16901690    if ( ! is_wp_error( $user_id ) ) {
    16911691
    1692         $blog_name = wp_specialchars_decode( get_option( 'blogname' ) );
     1692        $blog_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
    16931693
    16941694        if ( ! empty( $send_password_change_email ) ) {
     
    17421742            $pass_change_email['message'] = str_replace( '###ADMIN_EMAIL###', get_option( 'admin_email' ), $pass_change_email['message'] );
    17431743            $pass_change_email['message'] = str_replace( '###EMAIL###', $user['user_email'], $pass_change_email['message'] );
    1744             $pass_change_email['message'] = str_replace( '###SITENAME###', get_option( 'blogname' ), $pass_change_email['message'] );
     1744            $pass_change_email['message'] = str_replace( '###SITENAME###', $blog_name, $pass_change_email['message'] );
    17451745            $pass_change_email['message'] = str_replace( '###SITEURL###', home_url(), $pass_change_email['message'] );
    17461746
     
    17961796            $email_change_email['message'] = str_replace( '###ADMIN_EMAIL###', get_option( 'admin_email' ), $email_change_email['message'] );
    17971797            $email_change_email['message'] = str_replace( '###EMAIL###', $user['user_email'], $email_change_email['message'] );
    1798             $email_change_email['message'] = str_replace( '###SITENAME###', get_option( 'blogname' ), $email_change_email['message'] );
     1798            $email_change_email['message'] = str_replace( '###SITENAME###', $blog_name, $email_change_email['message'] );
    17991799            $email_change_email['message'] = str_replace( '###SITEURL###', home_url(), $email_change_email['message'] );
    18001800
Note: See TracChangeset for help on using the changeset viewer.