<!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>[32070] trunk: Improve handling of incomplete From and Content-Type headers in `wp_mail()`.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/32070">32070</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/32070","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-04-07 20:09:46 +0000 (Tue, 07 Apr 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Improve handling of incomplete From and Content-Type headers in `wp_mail()`.
When an incomplete header is provided (eg, 'From' with an email address but no
name), ensure that the WP defaults are filled in properly.
Props valendesigns.
Fixes <a href="https://core.trac.wordpress.org/ticket/30266">#30266</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunktestsphpunittestsmailphp">trunk/tests/phpunit/tests/mail.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludespluggablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pluggable.php 2015-04-07 19:13:45 UTC (rev 32069)
+++ trunk/src/wp-includes/pluggable.php 2015-04-07 20:09:46 UTC (rev 32070)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,30 +302,37 @@
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( strtolower( $name ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Mainly for legacy -- process a From: header if it's there
</span><span class="cx" style="display: block; padding: 0 10px"> case 'from':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos($content, '<' ) !== false ) {
- // So... making my life hard again?
- $from_name = substr( $content, 0, strpos( $content, '<' ) - 1 );
- $from_name = str_replace( '"', '', $from_name );
- $from_name = trim( $from_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bracket_pos = strpos( $content, '<' );
+ if ( $bracket_pos !== false ) {
+ // Text before the bracketed email is the "From" name.
+ if ( $bracket_pos > 0 ) {
+ $from_name = substr( $content, 0, $bracket_pos - 1 );
+ $from_name = str_replace( '"', '', $from_name );
+ $from_name = trim( $from_name );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $from_email = substr( $content, strpos( $content, '<' ) + 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $from_email = substr( $content, $bracket_pos + 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $from_email = str_replace( '>', '', $from_email );
</span><span class="cx" style="display: block; padding: 0 10px"> $from_email = trim( $from_email );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Avoid setting an empty $from_email.
+ } elseif ( '' !== trim( $content ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $from_email = trim( $content );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'content-type':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( strpos( $content, ';' ) !== false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- list( $type, $charset ) = explode( ';', $content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ list( $type, $charset_content ) = explode( ';', $content );
</ins><span class="cx" style="display: block; padding: 0 10px"> $content_type = trim( $type );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== stripos( $charset, 'charset=' ) ) {
- $charset = trim( str_replace( array( 'charset=', '"' ), '', $charset ) );
- } elseif ( false !== stripos( $charset, 'boundary=' ) ) {
- $boundary = trim( str_replace( array( 'BOUNDARY=', 'boundary=', '"' ), '', $charset ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== stripos( $charset_content, 'charset=' ) ) {
+ $charset = trim( str_replace( array( 'charset=', '"' ), '', $charset_content ) );
+ } elseif ( false !== stripos( $charset_content, 'boundary=' ) ) {
+ $boundary = trim( str_replace( array( 'BOUNDARY=', 'boundary=', '"' ), '', $charset_content ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $charset = '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Avoid setting an empty $content_type.
+ } elseif ( '' !== trim( $content ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $content_type = trim( $content );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span></span></pre></div>
<a id="trunktestsphpunittestsmailphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/mail.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/mail.php 2015-04-07 19:13:45 UTC (rev 32069)
+++ trunk/tests/phpunit/tests/mail.php 2015-04-07 20:09:46 UTC (rev 32070)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,4 +156,94 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Fatal errors
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_mail( 'invalid.address', 'subject', 'body', '', array() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 30266
+ */
+ public function test_wp_mail_with_valid_from_header() {
+ $to = "address@tld.com";
+ $subject = "Testing";
+ $message = "Test Message";
+ $headers = "From: Foo <bar@example.com>";
+ $expected = "From: Foo <bar@example.com>";
+
+ wp_mail( $to, $subject, $message, $headers );
+
+ $this->assertTrue( strpos( $GLOBALS['phpmailer']->mock_sent[0]['header'], $expected ) > 0 );
+ }
+
+ /**
+ * @ticket 30266
+ */
+ public function test_wp_mail_with_empty_from_header() {
+ $to = "address@tld.com";
+ $subject = "Testing";
+ $message = "Test Message";
+ $headers = "From: ";
+ $expected = "From: WordPress <wordpress@example.com>";
+
+ wp_mail( $to, $subject, $message, $headers );
+
+ $this->assertTrue( strpos( $GLOBALS['phpmailer']->mock_sent[0]['header'], $expected ) > 0 );
+ }
+
+ /**
+ * @ticket 30266
+ */
+ public function test_wp_mail_with_empty_from_name_for_the_from_header() {
+ $to = "address@tld.com";
+ $subject = "Testing";
+ $message = "Test Message";
+ $headers = "From: <wordpress@example.com>";
+ $expected = "From: WordPress <wordpress@example.com>";
+
+ wp_mail( $to, $subject, $message, $headers );
+
+ $this->assertTrue( strpos( $GLOBALS['phpmailer']->mock_sent[0]['header'], $expected ) > 0 );
+ }
+
+ /**
+ * @ticket 30266
+ */
+ public function test_wp_mail_with_valid_content_type_header() {
+ $to = "address@tld.com";
+ $subject = "Testing";
+ $message = "Test Message";
+ $headers = "Content-Type: text/html; charset=iso-8859-1";
+ $expected = "Content-Type: text/html; charset=iso-8859-1";
+
+ wp_mail( $to, $subject, $message, $headers );
+
+ $this->assertTrue( strpos( $GLOBALS['phpmailer']->mock_sent[0]['header'], $expected ) > 0 );
+ }
+
+ /**
+ * @ticket 30266
+ */
+ public function test_wp_mail_with_empty_content_type_header() {
+ $to = "address@tld.com";
+ $subject = "Testing";
+ $message = "Test Message";
+ $headers = "Content-Type: ";
+ $expected = "Content-Type: text/plain; charset=UTF-8";
+
+ wp_mail( $to, $subject, $message, $headers );
+
+ $this->assertTrue( strpos( $GLOBALS['phpmailer']->mock_sent[0]['header'], $expected ) > 0 );
+ }
+
+ /**
+ * @ticket 30266
+ */
+ public function test_wp_mail_with_empty_charset_for_the_content_type_header() {
+ $to = "address@tld.com";
+ $subject = "Testing";
+ $message = "Test Message";
+ $headers = "Content-Type: text/plain;";
+ $expected = "Content-Type: text/plain; charset=UTF-8";
+
+ wp_mail( $to, $subject, $message, $headers );
+
+ $this->assertTrue( strpos( $GLOBALS['phpmailer']->mock_sent[0]['header'], $expected ) > 0 );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>