Changeset 12398

Timestamp:

12/14/2009 10:09:54 PM (17 years ago)

Author:

westi

Message:

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

Location:

trunk

Files:

• wp-includes/pluggable.php (modified) (1 diff)
• wp-login.php (modified) (2 diffs)

trunk/wp-includes/pluggable.php

@@ -1137 +1137 @@
         if ( $user->user_email != get_option('admin_email') ) {
                 $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
-                wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), @html_entity_decode(get_option('blogname'), ENT_QUOTES, get_option('blog_charset'))), $message);
+                // The blogname option is escaped with esc_html on the way into the database in sanitize_option
+                // we want to reverse this for the plain text arena of emails.
+                $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
+                wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), $blogname), $message);
         }
 }

trunk/wp-login.php

@@ -168 +168 @@
         $message .= site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . "\r\n";
 
-        $title = sprintf(__('[%s] Password Reset'), get_option('blogname'));
+        // The blogname option is escaped with esc_html on the way into the database in sanitize_option
+        // we want to reverse this for the plain text arena of emails.
+        $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
+
+        $title = sprintf(__('[%s] Password Reset'), $blogname);
 
         $title = apply_filters('retrieve_password_title', $title);
@@ -213 +217 @@
         $message .= site_url('wp-login.php', 'login') . "\r\n";
 
-        $title = sprintf(__('[%s] Your new password'), get_option('blogname'));
+        // The blogname option is escaped with esc_html on the way into the database in sanitize_option
+        // we want to reverse this for the plain text arena of emails.
+        $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
+
+        $title = sprintf(__('[%s] Your new password'), $blogname);
 
         $title = apply_filters('password_reset_title', $title);