<!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>[17753] trunk/wp-includes/pluggable.php:
Use exceptions with phpmailer to avoid headers already sent errors.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17753">17753</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-04-28 18:16:01 +0000 (Thu, 28 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use exceptions with phpmailer to avoid headers already sent errors. fixes <a href="http://trac.wordpress.org/ticket/17228">#17228</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludespluggablephp">trunk/wp-includes/pluggable.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 (17752 => 17753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pluggable.php 2011-04-28 18:14:48 UTC (rev 17752)
+++ trunk/wp-includes/pluggable.php 2011-04-28 18:16:01 UTC (rev 17753)
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx"> if ( !is_object( $phpmailer ) || !is_a( $phpmailer, 'PHPMailer' ) ) {
</span><span class="cx"> require_once ABSPATH . WPINC . '/class-phpmailer.php';
</span><span class="cx"> require_once ABSPATH . WPINC . '/class-smtp.php';
</span><del>- $phpmailer = new PHPMailer();
</del><ins>+ $phpmailer = new PHPMailer( true );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Headers
</span><span class="lines">@@ -400,7 +400,11 @@
</span><span class="cx"> $to = explode( ',', $to );
</span><span class="cx">
</span><span class="cx"> foreach ( (array) $to as $recipient ) {
</span><del>- $phpmailer->AddAddress( trim( $recipient ) );
</del><ins>+ try {
+ $phpmailer->AddAddress( trim( $recipient ) );
+ } catch ( phpmailerException $e ) {
+ continue;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Set mail's subject and body
</span><span class="lines">@@ -410,13 +414,21 @@
</span><span class="cx"> // Add any CC and BCC recipients
</span><span class="cx"> if ( !empty( $cc ) ) {
</span><span class="cx"> foreach ( (array) $cc as $recipient ) {
</span><del>- $phpmailer->AddCc( trim($recipient) );
</del><ins>+ try {
+ $phpmailer->AddCc( trim($recipient) );
+ } catch ( phpmailerException $e ) {
+ continue;
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty( $bcc ) ) {
</span><span class="cx"> foreach ( (array) $bcc as $recipient) {
</span><del>- $phpmailer->AddBcc( trim($recipient) );
</del><ins>+ try {
+ $phpmailer->AddBcc( trim($recipient) );
+ } catch ( phpmailerException $e ) {
+ continue;
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -455,16 +467,24 @@
</span><span class="cx">
</span><span class="cx"> if ( !empty( $attachments ) ) {
</span><span class="cx"> foreach ( $attachments as $attachment ) {
</span><del>- $phpmailer->AddAttachment($attachment);
</del><ins>+ try {
+ $phpmailer->AddAttachment($attachment);
+ } catch ( phpmailerException $e ) {
+ continue;
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> do_action_ref_array( 'phpmailer_init', array( &$phpmailer ) );
</span><span class="cx">
</span><span class="cx"> // Send!
</span><del>- $result = @$phpmailer->Send();
</del><ins>+ try {
+ $phpmailer->Send();
+ } catch ( phpmailerException $e ) {
+ return false;
+ }
</ins><span class="cx">
</span><del>- return $result;
</del><ins>+ return true;
</ins><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>