From ac8f68cd2929e292d7c0aaaa9446f31434562de7 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 5 Sep 2015 12:25:41 +0000 Subject: [PATCH] * Mail: fix PHP Fatal error under 5.3 when displaying mails containing inline-images --- mail/inc/class.mail_ui.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php index 20eb70c975..4a38e31731 100644 --- a/mail/inc/class.mail_ui.inc.php +++ b/mail/inc/class.mail_ui.inc.php @@ -724,7 +724,7 @@ class mail_ui } // Check preview pane is enabled, then show spliter if ($this->mail_bo->mailPreferences['previewPane']) $etpl->setElementAttribute('mail.index.spliter', 'template', 'mail.index.nospliter'); - + return $etpl->exec('mail.mail_ui.index',$content,$sel_options,$readonlys,$preserv); } @@ -2935,7 +2935,7 @@ class mail_ui { if ($_type !="background") { - $bo = emailadmin_imapbase::getInstance(false, self::$icServerID); + $bo = emailadmin_imapbase::getInstance(false, mail_ui::$icServerID); $attachment = $bo->getAttachmentByCID($_uid, $CID, $_partID); // only use data uri for "smaller" images, as otherwise the first display of the mail takes to long