From 0c35d75565bff06092efad7bc8337e7a28a60de5 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Wed, 5 Feb 2014 09:24:46 +0000 Subject: [PATCH] fix warning in getMessageRawBody --- mail/inc/class.mail_ui.inc.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php index ec163f3afa..3cda25b32f 100644 --- a/mail/inc/class.mail_ui.inc.php +++ b/mail/inc/class.mail_ui.inc.php @@ -2391,8 +2391,8 @@ unset($query['actions']); $this->mail_bo->reopen($mailbox); - $message = $this->mail_bo->getMessageRawBody($uid, $partID); - $headers = $this->mail_bo->getMessageHeader($uid, $partID); + $message = $this->mail_bo->getMessageRawBody($uid, $partID, $mailbox); + $headers = $this->mail_bo->getMessageHeader($uid, $partID, true,false, $mailbox); $this->mail_bo->closeConnection(); @@ -2443,7 +2443,7 @@ unset($query['actions']); $uid = $hA['msgUID']; $mailbox = $hA['folder']; if ($mb != $this->mail_bo->mailbox) $this->mail_bo->reopen($mb = $mailbox); - $message = $this->mail_bo->getMessageRawBody($uid, $partID=''); + $message = $this->mail_bo->getMessageRawBody($uid, $partID='', $mailbox); if (!($fp = egw_vfs::fopen($file=$path.($name ? '/'.$name : ''),'wb')) || !fwrite($fp,$message)) { @@ -2458,7 +2458,7 @@ unset($query['actions']); if ($succeeded) { translation::add_app('mail'); - $headers = $this->mail_bo->getMessageHeader($uid,$partID,true); + $headers = $this->mail_bo->getMessageHeader($uid,$partID,true,false,$mailbox); unset($headers['SUBJECT']);//already in filename $infoSection = mail_bo::createHeaderInfoSection($headers, 'SUPPRESS', false); $props = array(array('name' => 'comment','val' => $infoSection));