mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-22 05:49:03 +01:00
PrintView (from compose) Make sure draftfolder settings from user-defined-account is checked (and applied if existing) before checking for draftfolder settings in felamimail preferences
This commit is contained in:
parent
809399b305
commit
22f96a06dc
@ -1327,7 +1327,18 @@
|
|||||||
$folder = $this->mailbox;
|
$folder = $this->mailbox;
|
||||||
// the folder for callfromcompose is hardcoded, because the message to be printed from the compose window is saved as draft, and can be
|
// the folder for callfromcompose is hardcoded, because the message to be printed from the compose window is saved as draft, and can be
|
||||||
// reopened for composing (only) from there
|
// reopened for composing (only) from there
|
||||||
if ($callfromcompose) $folder = $GLOBALS['egw_info']['user']['preferences']['felamimail']['draftFolder'];
|
if ($callfromcompose)
|
||||||
|
{
|
||||||
|
if (isset($this->mailPreferences->preferences['draftFolder']) &&
|
||||||
|
$this->mailPreferences->preferences['draftFolder'] != 'none')
|
||||||
|
{
|
||||||
|
$folder = $this->mailPreferences->preferences['draftFolder'];
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$folder = $GLOBALS['egw_info']['user']['preferences']['felamimail']['draftFolder'];
|
||||||
|
}
|
||||||
|
}
|
||||||
$this->bofelamimail->reopen($folder);
|
$this->bofelamimail->reopen($folder);
|
||||||
# print "$this->mailbox, $this->uid, $partID<br>";
|
# print "$this->mailbox, $this->uid, $partID<br>";
|
||||||
$headers = $this->bofelamimail->getMessageHeader($this->uid, $partID);
|
$headers = $this->bofelamimail->getMessageHeader($this->uid, $partID);
|
||||||
|
Loading…
Reference in New Issue
Block a user