summaryrefslogtreecommitdiff
path: root/vendor/swiftmailer/classes/Swift/Plugins
diff options
context:
space:
mode:
authorFrédéric Guillot <fred@kanboard.net>2014-09-19 15:29:39 +0200
committerFrédéric Guillot <fred@kanboard.net>2014-09-19 15:29:39 +0200
commit0a9a4ba0393d40f3bcba4e4e531bd0d51d2c3aff (patch)
tree1fba352c7d43bda85560874f6e14f32bf3f4ffc8 /vendor/swiftmailer/classes/Swift/Plugins
parentaf69070a647c85b2b4de76a415fc8641dc46c2e8 (diff)
Improve make-archive.sh and update swiftmailer
Diffstat (limited to 'vendor/swiftmailer/classes/Swift/Plugins')
-rw-r--r--vendor/swiftmailer/classes/Swift/Plugins/RedirectingPlugin.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/vendor/swiftmailer/classes/Swift/Plugins/RedirectingPlugin.php b/vendor/swiftmailer/classes/Swift/Plugins/RedirectingPlugin.php
index 90f380bc..21c23829 100644
--- a/vendor/swiftmailer/classes/Swift/Plugins/RedirectingPlugin.php
+++ b/vendor/swiftmailer/classes/Swift/Plugins/RedirectingPlugin.php
@@ -111,8 +111,13 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
$this->_filterHeaderSet($headers, 'Bcc');
// Add each hard coded recipient
+ $to = $message->getTo();
+ if (null === $to) {
+ $to = array();
+ }
+
foreach ( (array) $this->_recipient as $recipient) {
- if (!array_key_exists($recipient, $message->getTo())) {
+ if (!array_key_exists($recipient, $to)) {
$message->addTo($recipient);
}
}
@@ -190,6 +195,8 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
if ($headers->has('X-Swift-To')) {
$message->setTo($headers->get('X-Swift-To')->getNameAddresses());
$headers->removeAll('X-Swift-To');
+ } else {
+ $message->setTo(null);
}
if ($headers->has('X-Swift-Cc')) {