Ticket #17228: 17228.diff

wp-includes/pluggable.php

@@ -281 +281 @@
         if ( !is_object( $phpmailer ) || !is_a( $phpmailer, 'PHPMailer' ) ) {
                 require_once ABSPATH . WPINC . '/class-phpmailer.php';
                 require_once ABSPATH . WPINC . '/class-smtp.php';
-                $phpmailer = new PHPMailer();
+                $phpmailer = new PHPMailer( true );
         }
 
         // Headers
@@ -400 +400 @@
                 $to = explode( ',', $to );
 
         foreach ( (array) $to as $recipient ) {
-                $phpmailer->AddAddress( trim( $recipient ) );
+                try {
+                        $phpmailer->AddAddress( trim( $recipient ) );
+                } catch ( phpmailerException $e ) {
+                        return false;
+                }
         }
 
         // Set mail's subject and body
@@ -410 +414 @@
         // Add any CC and BCC recipients
         if ( !empty( $cc ) ) {
                 foreach ( (array) $cc as $recipient ) {
-                        $phpmailer->AddCc( trim($recipient) );
+                        try {
+                                $phpmailer->AddCc( trim($recipient) );
+                        } catch ( phpmailerException $e ) {
+                                return false;
+                        }
                 }
         }
 
         if ( !empty( $bcc ) ) {
                 foreach ( (array) $bcc as $recipient) {
-                        $phpmailer->AddBcc( trim($recipient) );
+                        try {
+                                $phpmailer->AddBcc( trim($recipient) );
+                        } catch ( phpmailerException $e ) {
+                                return false;
+                        }
                 }
         }
 
@@ -455 +467 @@
 
         if ( !empty( $attachments ) ) {
                 foreach ( $attachments as $attachment ) {
-                        $phpmailer->AddAttachment($attachment);
+                        try {
+                                $phpmailer->AddAttachment($attachment);
+                        } catch ( phpmailerException $e ) {
+                                return false;
+                        }
                 }
         }
 
         do_action_ref_array( 'phpmailer_init', array( &$phpmailer ) );
 
         // Send!
-        $result = @$phpmailer->Send();
+        try {
+                $phpmailer->Send();
+        } catch ( phpmailerException $e ) {
+                return false;
+        }
 
-        return $result;
+        return true;
 }
 endif;