Changeset 17753

Timestamp:

04/28/2011 06:16:01 PM (13 years ago)

Author:

ryan

Message:

Use exceptions with phpmailer to avoid headers already sent errors. fixes #17228

File:

• trunk/wp-includes/pluggable.php (modified) (6 diffs)

trunk/wp-includes/pluggable.php

@@ -282 +282 @@
         require_once ABSPATH . WPINC . '/class-phpmailer.php';
         require_once ABSPATH . WPINC . '/class-smtp.php';
-        $phpmailer = new PHPMailer();
+        $phpmailer = new PHPMailer( true );
     }
 
@@ -401 +401 @@
 
     foreach ( (array) $to as $recipient ) {
-        $phpmailer->AddAddress( trim( $recipient ) );
+        try {
+            $phpmailer->AddAddress( trim( $recipient ) );
+        } catch ( phpmailerException $e ) {
+            continue;
+        }
     }
 
@@ -411 +415 @@
     if ( !empty( $cc ) ) {
         foreach ( (array) $cc as $recipient ) {
-            $phpmailer->AddCc( trim($recipient) );
+            try {
+                $phpmailer->AddCc( trim($recipient) );
+            } catch ( phpmailerException $e ) {
+                continue;
+            }
         }
     }
@@ -417 +425 @@
     if ( !empty( $bcc ) ) {
         foreach ( (array) $bcc as $recipient) {
-            $phpmailer->AddBcc( trim($recipient) );
+            try {
+                $phpmailer->AddBcc( trim($recipient) );
+            } catch ( phpmailerException $e ) {
+                continue;
+            }
         }
     }
@@ -456 +468 @@
     if ( !empty( $attachments ) ) {
         foreach ( $attachments as $attachment ) {
-            $phpmailer->AddAttachment($attachment);
+            try {
+                $phpmailer->AddAttachment($attachment);
+            } catch ( phpmailerException $e ) {
+                continue;
+            }
         }
     }
@@ -463 +479 @@
 
     // Send!
-    $result = @$phpmailer->Send();
-
-    return $result;
+    try {
+        $phpmailer->Send();
+    } catch ( phpmailerException $e ) {
+        return false;
+    }
+
+    return true;
 }
 endif;