From 38bf42b5dbe6a07bc8d42231bd23cbaa737e3593 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Fri, 15 May 2015 14:07:36 +0000 Subject: [PATCH] use static function emailadmin_imapbase::merge instead of ->mail->merge --- mail/inc/class.mail_activesync.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mail/inc/class.mail_activesync.inc.php b/mail/inc/class.mail_activesync.inc.php index 1d974d058a..efe4fa188c 100644 --- a/mail/inc/class.mail_activesync.inc.php +++ b/mail/inc/class.mail_activesync.inc.php @@ -606,7 +606,7 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send $beforePlain = $beforeHtml = ""; $beforeHtml = ($disableRuler ?' 
':' 
'); $beforePlain = ($disableRuler ?"\r\n\r\n":"\r\n\r\n-- \r\n"); - $sigText = $this->mail->merge($signature,array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id'))); + $sigText = emailadmin_imapbase::merge($signature,array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id'))); if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' Signature to use:'.$sigText); $sigTextHtml = $beforeHtml.$sigText; $sigTextPlain = $beforePlain.translation::convertHTMLToText($sigText);