mirror
/
PHPMailer
mirror of https://github.com/PHPMailer/PHPMailer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #140 from Synchro/master 

Delay throwing of bad recipients exception, fixes #139
This commit is contained in:
Marcus Bointon 2013-11-14 06:33:54 -08:00
parent 999438bca2 40307c91dc
commit 0962b82b77
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
class.phpmailer.php
View File

@ -1218,9 +1218,6 @@ class PHPMailer
$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 @@ class PHPMailer
$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;
}