composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a regression introduced by [r3242] (warning when sending an email with an empty "To")

Browse Source 
SVN:trunk[3265]
This commit is contained in:
Denis Flaven
2014-07-11 13:27:13 +00:00
parent 02ee41ef09
commit 880653f191
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/email.class.inc.php
View File

@@ -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();

2
lib/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
View File

@@ -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!!
}
/**