extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merging into email headers adds '@missing_domain'

Browse Source
This commit is contained in:
Nathan Gray 2016-05-03 00:10:30 +00:00
parent c15fcdfb52
commit c8fe06551f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Mail.php
View File

@ -6696,8 +6696,9 @@ class Mail
// Parse destinations for placeholders
foreach(Mailer::$type2header as $type => $h)
{
//error_log($type . ': ' . $mailObject->getHeader(Mailer::$type2header[$type]) . ' -> ' .$bo_merge->merge_string($mailObject->getHeader(Mailer::$type2header[$type]),$val,$e,'text/plain',array(),self::$displayCharset));
$mailObject->addAddress($bo_merge->merge_string($mailObject->getHeader(Mailer::$type2header[$type]),$val,$e,'text/plain',array(),self::$displayCharset),'',$type);
$merged = $bo_merge->merge_string($mailObject->getHeader(Mailer::$type2header[$type]),$val,$e,'text/plain',array(),self::$displayCharset);
//error_log($type . ': ' . $mailObject->getHeader(Mailer::$type2header[$type]) . ' -> ' .$merged);
$mailObject->addAddress(trim($merged,'"'),'',$type);
}
// No addresses from placeholders? Treat it as just a contact ID