extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-01 02:49:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Backport commit r48145, committed by Nathan Gray. Make sure the merge doesn't fail if there's no email found

Browse Source
This commit is contained in:
Hadi Nategh 2014-08-22 13:00:24 +00:00
parent cca8e33942
commit cbf356faab
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
emailadmin/inc/class.emailadmin_imapbase.inc.php
View File

@ -5925,8 +5925,11 @@ class emailadmin_imapbase
//error_log(__METHOD__.' ('.__LINE__.') '.array2string($contact)); //error_log(__METHOD__.' ('.__LINE__.') '.array2string($contact));
$email = ($contact['email'] ? $contact['email'] : $contact['email_home']); $email = ($contact['email'] ? $contact['email'] : $contact['email_home']);
$nfn = ($contact['n_fn'] ? $contact['n_fn'] : $contact['n_given'].' '.$contact['n_family']); $nfn = ($contact['n_fn'] ? $contact['n_fn'] : $contact['n_given'].' '.$contact['n_family']);
if($email)
{
$mailObject->AddAddress(self::$idna2->encode($email),$mailObject->EncodeHeader($nfn)); $mailObject->AddAddress(self::$idna2->encode($email),$mailObject->EncodeHeader($nfn));
} }
}
$mailObject->Subject = $bo_merge->merge_string($Subject, $val, $e, 'text/plain', array(), self::$displayCharset); $mailObject->Subject = $bo_merge->merge_string($Subject, $val, $e, 'text/plain', array(), self::$displayCharset);
if (!empty($AltBody)) if (!empty($AltBody))
{ {