WordPress.org

Make WordPress Core

Changeset 12398


Ignore:
Timestamp:
12/14/2009 10:09:54 PM (11 years ago)
Author:
westi
Message:

Fix some more html encoding in email subject issues. Fixes #9913.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/pluggable.php

    r12388 r12398  
    11371137    if ( $user->user_email != get_option('admin_email') ) {
    11381138        $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
    1139         wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), @html_entity_decode(get_option('blogname'), ENT_QUOTES, get_option('blog_charset'))), $message);
     1139        // The blogname option is escaped with esc_html on the way into the database in sanitize_option
     1140        // we want to reverse this for the plain text arena of emails.
     1141        $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
     1142        wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), $blogname), $message);
    11401143    }
    11411144}
  • trunk/wp-login.php

    r12266 r12398  
    168168    $message .= site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . "\r\n";
    169169
    170     $title = sprintf(__('[%s] Password Reset'), get_option('blogname'));
     170    // The blogname option is escaped with esc_html on the way into the database in sanitize_option
     171    // we want to reverse this for the plain text arena of emails.
     172    $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
     173
     174    $title = sprintf(__('[%s] Password Reset'), $blogname);
    171175
    172176    $title = apply_filters('retrieve_password_title', $title);
     
    213217    $message .= site_url('wp-login.php', 'login') . "\r\n";
    214218
    215     $title = sprintf(__('[%s] Your new password'), get_option('blogname'));
     219    // The blogname option is escaped with esc_html on the way into the database in sanitize_option
     220    // we want to reverse this for the plain text arena of emails.
     221    $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
     222
     223    $title = sprintf(__('[%s] Your new password'), $blogname);
    216224
    217225    $title = apply_filters('password_reset_title', $title);
Note: See TracChangeset for help on using the changeset viewer.