forked from extern/egroupware
Backport commit r48145, committed by Nathan Gray. Make sure the merge doesn't fail if there's no email found
This commit is contained in:
parent
cca8e33942
commit
cbf356faab
@ -5925,8 +5925,11 @@ class emailadmin_imapbase
|
||||
//error_log(__METHOD__.' ('.__LINE__.') '.array2string($contact));
|
||||
$email = ($contact['email'] ? $contact['email'] : $contact['email_home']);
|
||||
$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->Subject = $bo_merge->merge_string($Subject, $val, $e, 'text/plain', array(), self::$displayCharset);
|
||||
if (!empty($AltBody))
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user