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

* Mail: fix PHP Fatal error under 5.3 when displaying mails containing inline-images

Browse Source
This commit is contained in:
Ralf Becker 2015-09-05 12:25:41 +00:00
parent f55ce966cb
commit ac8f68cd29
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/inc/class.mail_ui.inc.php
View File

@ -724,7 +724,7 @@ class mail_ui
} }
// Check preview pane is enabled, then show spliter // Check preview pane is enabled, then show spliter
if ($this->mail_bo->mailPreferences['previewPane']) $etpl->setElementAttribute('mail.index.spliter', 'template', 'mail.index.nospliter'); 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); return $etpl->exec('mail.mail_ui.index',$content,$sel_options,$readonlys,$preserv);
} }
@ -2935,7 +2935,7 @@ class mail_ui
{ {
if ($_type !="background") if ($_type !="background")
{ {
$bo = emailadmin_imapbase::getInstance(false, self::$icServerID); $bo = emailadmin_imapbase::getInstance(false, mail_ui::$icServerID);
$attachment = $bo->getAttachmentByCID($_uid, $CID, $_partID); $attachment = $bo->getAttachmentByCID($_uid, $CID, $_partID);
// only use data uri for "smaller" images, as otherwise the first display of the mail takes to long // only use data uri for "smaller" images, as otherwise the first display of the mail takes to long