From 880653f1916ae2877e841c368b18d4feaafc3b9e Mon Sep 17 00:00:00 2001 From: Denis Flaven Date: Fri, 11 Jul 2014 13:27:13 +0000 Subject: [PATCH] Fixed a regression introduced by [r3242] (warning when sending an email with an empty "To") SVN:trunk[3265] --- core/email.class.inc.php | 9 ++++++--- .../lib/classes/Swift/Mime/SimpleMimeEntity.php | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/core/email.class.inc.php b/core/email.class.inc.php index 7eb528fa1..c2b8a3b8e 100644 --- a/core/email.class.inc.php +++ b/core/email.class.inc.php @@ -184,10 +184,13 @@ class EMail $oMailer = Swift_Mailer::newInstance($oTransport); - $iSent = $oMailer->send($this->m_oMessage); + $aFailedRecipients = array(); + $iSent = $oMailer->send($this->m_oMessage, $aFailedRecipients); if ($iSent === 0) { - $aIssues = array('No valid recipient for this message.'); + // Beware: it seems that $aFailedRecipients sometimes contains the recipients that actually received the message !!! + IssueLog::Warning('Email sending failed: Some recipients were invalid, aFailedRecipients contains: '.implode(', ', $aFailedRecipients)); + $aIssues = array('Some recipients were invalid.'); return EMAIL_SEND_ERROR; } else @@ -321,7 +324,7 @@ class EMail public function GetRecipientTO($bAsString = false) { $aRes = $this->m_oMessage->getTo(); - if ($aRes === false) + if ($aRes === null) { // There is no "To" header field $aRes = array(); diff --git a/lib/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php b/lib/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php index ad34612bb..dbbb8c177 100644 --- a/lib/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php +++ b/lib/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php @@ -595,7 +595,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity if ($this->_headers->has($field)) { return $this->_headers->get($field)->getFieldBodyModel(); } - return false; + return null; // Returning null is equivalent to no return, but is easier to read!! } /**