<!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" />
<title>[27801] trunk/src: Always decode special characters for email subjects.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27801">27801</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-03-28 02:43:04 +0000 (Fri, 28 Mar 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Always decode special characters for email subjects.

props tlovett1, jeremyfelt.
fixes <a href="http://core.trac.wordpress.org/ticket/25346">#25346</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpupgraderphp">trunk/src/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesmsphp">trunk/src/wp-admin/includes/ms.php</a></li>
<li><a href="#trunksrcwpadminmsdeletesitephp">trunk/src/wp-admin/ms-delete-site.php</a></li>
<li><a href="#trunksrcwpadminusernewphp">trunk/src/wp-admin/user-new.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunksrcwploginphp">trunk/src/wp-login.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-upgrader.php (27800 => 27801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-upgrader.php        2014-03-28 02:40:47 UTC (rev 27800)
+++ trunk/src/wp-admin/includes/class-wp-upgrader.php   2014-03-28 02:43:04 UTC (rev 27801)
</span><span class="lines">@@ -2420,7 +2420,7 @@
</span><span class="cx">           */
</span><span class="cx">          $email = apply_filters( 'auto_core_update_email', $email, $type, $core_update, $result );
</span><span class="cx"> 
</span><del>-               wp_mail( $email['to'], $email['subject'], $email['body'], $email['headers'] );
</del><ins>+                wp_mail( $email['to'], wp_specialchars_decode( $email['subject'] ), $email['body'], $email['headers'] );
</ins><span class="cx">   }
</span><span class="cx"> 
</span><span class="cx">  /**
</span><span class="lines">@@ -2570,6 +2570,6 @@
</span><span class="cx">           */
</span><span class="cx">          $email = apply_filters( 'automatic_updates_debug_email', $email, $failures, $this->update_results );
</span><span class="cx"> 
</span><del>-               wp_mail( $email['to'], $email['subject'], $email['body'], $email['headers'] );
</del><ins>+                wp_mail( $email['to'], wp_specialchars_decode( $email['subject'] ), $email['body'], $email['headers'] );
</ins><span class="cx">   }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/ms.php (27800 => 27801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/ms.php       2014-03-28 02:40:47 UTC (rev 27800)
+++ trunk/src/wp-admin/includes/ms.php  2014-03-28 02:43:04 UTC (rev 27801)
</span><span class="lines">@@ -259,7 +259,7 @@
</span><span class="cx">  $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content );
</span><span class="cx">  $content = str_replace( '###SITEURL###', network_home_url(), $content );
</span><span class="cx"> 
</span><del>-       wp_mail( $value, sprintf( __( '[%s] New Admin Email Address' ), get_option( 'blogname' ) ), $content );
</del><ins>+        wp_mail( $value, sprintf( __( '[%s] New Admin Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'update_option_new_admin_email', 'update_option_new_admin_email', 10, 2 );
</span><span class="cx"> add_action( 'add_option_new_admin_email', 'update_option_new_admin_email', 10, 2 );
</span><span class="lines">@@ -328,7 +328,7 @@
</span><span class="cx">          $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content );
</span><span class="cx">          $content = str_replace( '###SITEURL###', network_home_url(), $content );
</span><span class="cx"> 
</span><del>-               wp_mail( $_POST['email'], sprintf( __( '[%s] New Email Address' ), get_option( 'blogname' ) ), $content );
</del><ins>+                wp_mail( $_POST['email'], sprintf( __( '[%s] New Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content );
</ins><span class="cx">           $_POST['email'] = $current_user->user_email;
</span><span class="cx">  }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpadminmsdeletesitephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/ms-delete-site.php (27800 => 27801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/ms-delete-site.php    2014-03-28 02:40:47 UTC (rev 27800)
+++ trunk/src/wp-admin/ms-delete-site.php       2014-03-28 02:43:04 UTC (rev 27801)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">  $content = str_replace( '###URL_DELETE###', $url_delete, $content );
</span><span class="cx">  $content = str_replace( '###SITE_NAME###', $current_site->site_name, $content );
</span><span class="cx"> 
</span><del>-       wp_mail( get_option( 'admin_email' ), "[ " . get_option( 'blogname' ) . " ] ".__( 'Delete My Site' ), $content );
</del><ins>+        wp_mail( get_option( 'admin_email' ), "[ " . wp_specialchars_decode( get_option( 'blogname' ) ) . " ] ".__( 'Delete My Site' ), $content );
</ins><span class="cx">   ?>
</span><span class="cx"> 
</span><span class="cx">  <p><?php _e( 'Thank you. Please check your email for a link to confirm your action. Your site will not be deleted until this link is clicked. ') ?></p>
</span></span></pre></div>
<a id="trunksrcwpadminusernewphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/user-new.php (27800 => 27801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/user-new.php  2014-03-28 02:40:47 UTC (rev 27800)
+++ trunk/src/wp-admin/user-new.php     2014-03-28 02:43:04 UTC (rev 27801)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> 
</span><span class="cx"> Please click the following link to confirm the invite:
</span><span class="cx"> %4$s' );
</span><del>-                       wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), get_option( 'blogname' ) ), sprintf( $message, get_option( 'blogname' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ), home_url( "/newbloguser/$newuser_key/" ) ) );
</del><ins>+                        wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), sprintf( $message, get_option( 'blogname' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ), home_url( "/newbloguser/$newuser_key/" ) ) );
</ins><span class="cx">                   $redirect = add_query_arg( array('update' => 'add'), 'user-new.php' );
</span><span class="cx">          }
</span><span class="cx">  }
</span></span></pre></div>
<a id="trunksrcwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/ms-functions.php (27800 => 27801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/ms-functions.php   2014-03-28 02:40:47 UTC (rev 27800)
+++ trunk/src/wp-includes/ms-functions.php      2014-03-28 02:43:04 UTC (rev 27801)
</span><span class="lines">@@ -880,7 +880,7 @@
</span><span class="cx">          $from_name,
</span><span class="cx">          esc_url( 'http://' . $domain . $path )
</span><span class="cx">  );
</span><del>-       wp_mail($user_email, $subject, $message, $message_headers);
</del><ins>+        wp_mail( $user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
</ins><span class="cx">   return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -965,7 +965,7 @@
</span><span class="cx">          $from_name,
</span><span class="cx">          $user
</span><span class="cx">  );
</span><del>-       wp_mail($user_email, $subject, $message, $message_headers);
</del><ins>+        wp_mail( $user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
</ins><span class="cx">   return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1521,7 +1521,7 @@
</span><span class="cx">   * @param string $subject Subject of the email.
</span><span class="cx">   */
</span><span class="cx">  $subject = apply_filters( 'update_welcome_subject', sprintf( __( 'New %1$s Site: %2$s' ), $current_site->site_name, wp_unslash( $title ) ) );
</span><del>-       wp_mail($user->user_email, $subject, $message, $message_headers);
</del><ins>+        wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
</ins><span class="cx">   return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1599,7 +1599,7 @@
</span><span class="cx">   * @param string $subject Subject of the email.
</span><span class="cx">   */
</span><span class="cx">  $subject = apply_filters( 'update_welcome_user_subject', sprintf( __( 'New %1$s User: %2$s' ), $current_site->site_name, $user->user_login) );
</span><del>-       wp_mail($user->user_email, $subject, $message, $message_headers);
</del><ins>+        wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
</ins><span class="cx">   return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunksrcwpincludespluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/pluggable.php (27800 => 27801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/pluggable.php      2014-03-28 02:40:47 UTC (rev 27800)
+++ trunk/src/wp-includes/pluggable.php 2014-03-28 02:43:04 UTC (rev 27801)
</span><span class="lines">@@ -1168,7 +1168,7 @@
</span><span class="cx">  $message_headers = apply_filters( 'comment_notification_headers',    $message_headers, $comment_id );
</span><span class="cx"> 
</span><span class="cx">  foreach ( $emails as $email ) {
</span><del>-               @wp_mail( $email, $subject, $notify_message, $message_headers );
</del><ins>+                @wp_mail( $email, wp_specialchars_decode( $subject ), $notify_message, $message_headers );
</ins><span class="cx">   }
</span><span class="cx"> 
</span><span class="cx">  return true;
</span><span class="lines">@@ -1255,7 +1255,7 @@
</span><span class="cx">  $message_headers = apply_filters( 'comment_moderation_headers',    $message_headers, $comment_id );
</span><span class="cx"> 
</span><span class="cx">  foreach ( $emails as $email ) {
</span><del>-               @wp_mail( $email, $subject, $notify_message, $message_headers );
</del><ins>+                @wp_mail( $email, wp_specialchars_decode( $subject ), $notify_message, $message_headers );
</ins><span class="cx">   }
</span><span class="cx"> 
</span><span class="cx">  return true;
</span></span></pre></div>
<a id="trunksrcwploginphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-login.php (27800 => 27801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-login.php   2014-03-28 02:40:47 UTC (rev 27800)
+++ trunk/src/wp-login.php      2014-03-28 02:43:04 UTC (rev 27801)
</span><span class="lines">@@ -388,7 +388,7 @@
</span><span class="cx">   */
</span><span class="cx">  $message = apply_filters( 'retrieve_password_message', $message, $key );
</span><span class="cx"> 
</span><del>-       if ( $message && !wp_mail($user_email, $title, $message) )
</del><ins>+        if ( $message && !wp_mail( $user_email, wp_specialchars_decode( $title ), $message ) )
</ins><span class="cx">           wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function.') );
</span><span class="cx"> 
</span><span class="cx">  return true;
</span></span></pre>
</div>
</div>

</body>
</html>