Delay throwing of bad recipients exception, fixes PHPMailer#139

batmah · Nov 14, 2013 · 40307c9 · 40307c9
1 parent 999438b
commit 40307c9
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/class.phpmailer.php b/class.phpmailer.php
@@ -1218,9 +1218,6 @@ protected function smtpSend($header, $body)
             $this->doCallback($isSent, '', '', $bcc[0], $this->Subject, $body, $this->From);
         }
 
-        if (count($bad_rcpt) > 0) { //Create error message for any bad addresses
-            throw new phpmailerException($this->lang('recipients_failed') . implode(', ', $bad_rcpt));
-        }
         if (!$this->smtp->data($header . $body)) {
             throw new phpmailerException($this->lang('data_not_accepted'), self::STOP_CRITICAL);
         }
@@ -1230,6 +1227,12 @@ protected function smtpSend($header, $body)
             $this->smtp->quit();
             $this->smtp->close();
         }
+        if (count($bad_rcpt) > 0) { //Create error message for any bad addresses
+            throw new phpmailerException(
+                $this->lang('recipients_failed') . implode(', ', $bad_rcpt),
+                self::STOP_CONTINUE
+            );
+        }
         return true;
     }