From 801df2d0dda1cb8f9746a99e1a41bb85a4d63e81 Mon Sep 17 00:00:00 2001 From: thomasb Date: Tue, 27 May 2008 06:41:46 +0000 Subject: Moved RoundCube functionality from lib to rcube_imap class; removed debug log git-svn-id: https://svn.roundcube.net/trunk@1430 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_imap.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'roundcubemail/program/include') diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php index f228a5364..e9aee3772 100644 --- a/roundcubemail/program/include/rcube_imap.php +++ b/roundcubemail/program/include/rcube_imap.php @@ -1414,12 +1414,15 @@ class rcube_imap // send expunge command in order to have the moved message // really deleted from the source mailbox - if ($moved) - { + if ($moved) { $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)) { + return iil_C_Delete($this->conn, $from_mbox, join(',', $a_mids)); + } // remove message ids from search set if ($moved && $this->search_set && $from_mbox == $this->mailbox) -- cgit v1.2.3