From: <nat...@us...> - 2014-08-20 15:22:04
|
Author: nathangray Date: Wed Aug 20 17:21:47 2014 New Revision: 48145 URL: http://svn.stylite.de/viewvc/egroupware?rev=48145&view=rev Log: Make sure the merge doesn't fail if there's no email found Modified: trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php Modified: trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php URL: http://svn.stylite.de/viewvc/egroupware/trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php?rev=48145&r1=48144&r2=48145&view=diff ============================================================================== --- trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php (original) +++ trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php Wed Aug 20 17:21:47 2014 @@ -5925,7 +5925,10 @@ //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']); - $mailObject->AddAddress(self::$idna2->encode($email),$mailObject->EncodeHeader($nfn)); + 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)) |