extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 07:09:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Mail: fix deleting mails from draft folder does not respect "move to trash" in delete message preference

Browse Source
This commit is contained in:
Hadi Nategh 2018-09-20 15:25:11 +02:00
parent 66bb77b37c
commit 9e1d9e143e
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/src/Mail.php
View File

@ -3923,8 +3923,7 @@ class Mail
$trashFolder = $this->getTrashFolder(); $trashFolder = $this->getTrashFolder();
$draftFolder = $this->getDraftFolder(); //$GLOBALS['egw_info']['user']['preferences']['mail']['draftFolder']; $draftFolder = $this->getDraftFolder(); //$GLOBALS['egw_info']['user']['preferences']['mail']['draftFolder'];
$templateFolder = $this->getTemplateFolder(); //$GLOBALS['egw_info']['user']['preferences']['mail']['templateFolder']; $templateFolder = $this->getTemplateFolder(); //$GLOBALS['egw_info']['user']['preferences']['mail']['templateFolder'];
if((strtolower($_folder) == strtolower($trashFolder) && $deleteOptions == "move_to_trash") || if((strtolower($_folder) == strtolower($trashFolder) && $deleteOptions == "move_to_trash")) {
(strtolower($_folder) == strtolower($draftFolder))) {
$deleteOptions = "remove_immediately"; $deleteOptions = "remove_immediately";
} }
if($this->icServer->getCurrentMailbox() != $_folder) { if($this->icServer->getCurrentMailbox() != $_folder) {