extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-24 03:41:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

no need to fetch mail again

Browse Source
This commit is contained in:
Ralf Becker 2015-11-11 12:26:14 +00:00
parent 6969120d8b
commit 3d85ca9db6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1910,7 +1910,7 @@ class mail_ui
$etpl->exec('mail.mail_ui.displayMessage',$content,$sel_options,$readonlys,$preserv,2); $etpl->exec('mail.mail_ui.displayMessage',$content,$sel_options,$readonlys,$preserv,2);
} }
/** /**
* Build actions for display toolbar * Build actions for display toolbar
*/ */
@ -1938,7 +1938,7 @@ class mail_ui
$actions = array_reverse($actions,true); $actions = array_reverse($actions,true);
return $actions; return $actions;
} }
/** /**
* createAttachmentBlock * createAttachmentBlock
* helper function to create the attachment block/table * helper function to create the attachment block/table
@ -2373,7 +2373,6 @@ class mail_ui
$this->mail_bo->reopen($mailbox); $this->mail_bo->reopen($mailbox);
$message = $this->mail_bo->getMessageRawBody($uid, $partID, $mailbox); $message = $this->mail_bo->getMessageRawBody($uid, $partID, $mailbox);
$headers = $this->mail_bo->getMessageHeader($uid, $partID, true,false, $mailbox);
$this->mail_bo->closeConnection(); $this->mail_bo->closeConnection();
if ($rememberServerID != $this->mail_bo->profileID) if ($rememberServerID != $this->mail_bo->profileID)
@ -2385,6 +2384,7 @@ class mail_ui
$GLOBALS['egw']->session->commit_session(); $GLOBALS['egw']->session->commit_session();
if (!$display) if (!$display)
{ {
$headers = Horde_Mime_Headers::parseHeaders($message);
$subject = str_replace('$$','__',mail_bo::decode_header($headers['SUBJECT'])); $subject = str_replace('$$','__',mail_bo::decode_header($headers['SUBJECT']));
html::safe_content_header($message, $subject.".eml", $mime='message/rfc822', $size=0, true, true); html::safe_content_header($message, $subject.".eml", $mime='message/rfc822', $size=0, true, true);
echo $message; echo $message;