extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 17:18:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix messages from draft and templates not opening in compose mode; fix typo that prevented the correct change of profile in getComposeFrom

Browse Source
This commit is contained in:
Klaus Leithoff 2014-01-21 08:26:59 +00:00
parent 8d4e50920c
commit d698f88e77
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail/inc/class.mail_compose.inc.php
View File

@ -1293,7 +1293,7 @@ class mail_compose
$icServerID = $hA['profileID']; $icServerID = $hA['profileID'];
if ($icServerID != $this->mail_bo->profileID) if ($icServerID != $this->mail_bo->profileID)
{ {
$this->changeProfile($_content['serverID']); $this->changeProfile($icServerID);
$composeProfile = $this->mail_bo->profileID; $composeProfile = $this->mail_bo->profileID;
} }
$icServer = $this->mail_bo->icServer; $icServer = $this->mail_bo->icServer;

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

@ -1767,6 +1767,10 @@ unset($query['actions']);
$uid = $hA['msgUID']; $uid = $hA['msgUID'];
$mailbox = $hA['folder']; $mailbox = $hA['folder'];
//error_log(__METHOD__.__LINE__.array2string($hA)); //error_log(__METHOD__.__LINE__.array2string($hA));
if ($this->mail_bo->isDraftFolder($mailbox) || $this->mail_bo->isTemplateFolder($mailbox))
{
egw::redirect_link('/index.php',array('menuaction'=>'mail.mail_compose.compose','id'=>$rowID,'from'=>'composefromdraft'));
}
$this->mail_bo->reopen($mailbox); $this->mail_bo->reopen($mailbox);
// retrieve the flags of the message, before touching it. // retrieve the flags of the message, before touching it.
$headers = $this->mail_bo->getMessageHeader($uid, $partID); $headers = $this->mail_bo->getMessageHeader($uid, $partID);