<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12398] trunk: Fix some more html encoding in email subject issues.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12398">12398</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-12-14 22:09:54 +0000 (Mon, 14 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix some more html encoding in email subject issues. Fixes <a href="http://trac.wordpress.org/ticket/9913">#9913</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludespluggablephp">trunk/wp-includes/pluggable.php</a></li>
<li><a href="#trunkwploginphp">trunk/wp-login.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludespluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pluggable.php (12397 => 12398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pluggable.php 2009-12-14 16:46:05 UTC (rev 12397)
+++ trunk/wp-includes/pluggable.php 2009-12-14 22:09:54 UTC (rev 12398)
</span><span class="lines">@@ -1136,7 +1136,10 @@
</span><span class="cx"> // but check to see if it's the admin whose password we're changing, and skip this
</span><span class="cx"> if ( $user->user_email != get_option('admin_email') ) {
</span><span class="cx"> $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
</span><del>- wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), @html_entity_decode(get_option('blogname'), ENT_QUOTES, get_option('blog_charset'))), $message);
</del><ins>+ // 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);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> endif;
</span></span></pre></div>
<a id="trunkwploginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-login.php (12397 => 12398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-login.php 2009-12-14 16:46:05 UTC (rev 12397)
+++ trunk/wp-login.php 2009-12-14 22:09:54 UTC (rev 12398)
</span><span class="lines">@@ -167,8 +167,12 @@
</span><span class="cx"> $message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n";
</span><span class="cx"> $message .= site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . "\r\n";
</span><span class="cx">
</span><del>- $title = sprintf(__('[%s] Password Reset'), get_option('blogname'));
</del><ins>+ // 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);
</ins><span class="cx">
</span><ins>+ $title = sprintf(__('[%s] Password Reset'), $blogname);
+
</ins><span class="cx"> $title = apply_filters('retrieve_password_title', $title);
</span><span class="cx"> $message = apply_filters('retrieve_password_message', $message, $key);
</span><span class="cx">
</span><span class="lines">@@ -212,8 +216,12 @@
</span><span class="cx"> $message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";
</span><span class="cx"> $message .= site_url('wp-login.php', 'login') . "\r\n";
</span><span class="cx">
</span><del>- $title = sprintf(__('[%s] Your new password'), get_option('blogname'));
</del><ins>+ // 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);
</ins><span class="cx">
</span><ins>+ $title = sprintf(__('[%s] Your new password'), $blogname);
+
</ins><span class="cx"> $title = apply_filters('password_reset_title', $title);
</span><span class="cx"> $message = apply_filters('password_reset_message', $message, $new_pass);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>