summaryrefslogtreecommitdiff
path: root/roundcubemail/program/include
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-06-11 19:26:08 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-06-11 19:26:08 +0000
commit7ccc5472194c7be8d1dfcc1c00d33b1578b2da4e (patch)
tree8058f7910c851682bbbd9071db9e851ed552f151 /roundcubemail/program/include
parentdce7957478999895361dcce3189c8011f1c73afb (diff)
- don't call expunge and don't remove message row after message move
if flag_for_deletion is set to true (#1485002) git-svn-id: https://svn.roundcube.net/trunk@1508 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include')
-rw-r--r--roundcubemail/program/include/rcube_imap.php10
1 files changed, 7 insertions, 3 deletions
diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php
index 9d8f6d314..7f3fd9a1b 100644
--- a/roundcubemail/program/include/rcube_imap.php
+++ b/roundcubemail/program/include/rcube_imap.php
@@ -1419,9 +1419,13 @@ class rcube_imap
// send expunge command in order to have the moved message
// really deleted from the source mailbox
if ($moved) {
- $this->_expunge($from_mbox, FALSE);
- $this->_clear_messagecount($from_mbox);
- $this->_clear_messagecount($to_mbox);
+ // but only when flag_for_deletion is set to false
+ if (!rcmail::get_instance()->config->get('flag_for_deletion', false))
+ {
+ $this->_expunge($from_mbox, FALSE);
+ $this->_clear_messagecount($from_mbox);
+ $this->_clear_messagecount($to_mbox);
+ }
}
// moving failed
else if (rcmail::get_instance()->config->get('delete_always', false)) {