From 0d417bd376ae45e59bb6c4689ae24875c1d5287e Mon Sep 17 00:00:00 2001 From: alec Date: Thu, 4 Mar 2010 15:34:32 +0000 Subject: - Fix inconsistent behaviour of 'delete_always' option (#1486299) git-svn-id: https://svn.roundcube.net/trunk@3318 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_imap.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'roundcubemail/program') diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php index 307914eef..4c3c64767 100644 --- a/roundcubemail/program/include/rcube_imap.php +++ b/roundcubemail/program/include/rcube_imap.php @@ -1793,7 +1793,7 @@ class rcube_imap // 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 @@ class rcube_imap $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 -- cgit v1.2.3