AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve make-archive.sh and update swiftmailer

Browse Source
This commit is contained in:
Frédéric Guillot
2014-09-19 15:29:39 +02:00
parent af69070a64
commit 0a9a4ba039
4 changed files with 28 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
vendor/swiftmailer/classes/Swift/Transport/AbstractSmtpTransport.php vendored
View File

@@ -166,13 +166,13 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
$to = (array) $message->getTo();
$cc = (array) $message->getCc();
$tos = array_merge($to, $cc);
$bcc = (array) $message->getBcc();
$message->setBcc(array());
try {
$sent += $this->_sendTo($message, $reversePath, $to, $failedRecipients);
$sent += $this->_sendCc($message, $reversePath, $cc, $failedRecipients);
$sent += $this->_sendTo($message, $reversePath, $tos, $failedRecipients);
$sent += $this->_sendBcc($message, $reversePath, $bcc, $failedRecipients);
} catch (Exception $e) {
$message->setBcc($bcc);
@@ -444,17 +444,6 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
$failedRecipients);
}
/** Send a message to the given Cc: recipients */
private function _sendCc(Swift_Mime_Message $message, $reversePath, array $cc, array &$failedRecipients)
{
if (empty($cc)) {
return 0;
}
return $this->_doMailTransaction($message, $reversePath, array_keys($cc),
$failedRecipients);
}
/** Send a message to all Bcc: recipients */
private function _sendBcc(Swift_Mime_Message $message, $reversePath, array $bcc, array &$failedRecipients)
{