Changeset 12398 for trunk/wp-login.php

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.

File:

• trunk/wp-login.php (modified) (2 diffs)

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);