[eGroupWare-svn] r55990 - /trunk/egroupware/api/src/Mail.php

Author: nathangray
Date: Tue May  3 02:10:30 2016
New Revision: 55990

URL: http://svn.stylite.de/viewvc/egroupware?rev=55990&view=rev
Log:
Fix merging into email headers adds '@missing_domain'

Modified:
    trunk/egroupware/api/src/Mail.php

Modified: trunk/egroupware/api/src/Mail.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Mail.php?rev=55990&r1=55989&r2=55990&view=diff
==============================================================================
--- trunk/egroupware/api/src/Mail.php (original)
+++ trunk/egroupware/api/src/Mail.php Tue May  3 02:10:30 2016
@@ -6696,8 +6696,9 @@
 						// 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


------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z