From f1ce5163e5b91ab2efc0eb28eec7091be0144483 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 04 Mar 2010 10:34:32 -0500
Subject: [PATCH] - Fix inconsistent behaviour of 'delete_always' option (#1486299)
---
program/include/rcube_imap.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 307914e..4c3c647 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -1793,7 +1793,7 @@
// move messages
$iil_move = iil_C_Move($this->conn, join(',', $a_uids), $from_mbox, $to_mbox);
$moved = !($iil_move === false || $iil_move < 0);
-
+
// send expunge command in order to have the moved message
// really deleted from the source mailbox
if ($moved) {
@@ -1802,8 +1802,8 @@
$this->_clear_messagecount($to_mbox);
}
// moving failed
- else if (rcmail::get_instance()->config->get('delete_always', false)) {
- return iil_C_Delete($this->conn, $from_mbox, join(',', $a_uids));
+ else if ($config->get('delete_always', false) && $tbox == $config->get('trash_mbox')) {
+ return $this->delete_message($a_uids, $fbox);
}
// remove message ids from search set
--
Gitblit v1.9.1