summaryrefslogtreecommitdiff
path: root/program/include/rcube_imap.php
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2008-05-27 06:41:46 +0000
committerthomascube <thomas@roundcube.net>2008-05-27 06:41:46 +0000
commitbf0cb98701a616ea78ffe2579d9e2efa1ae9d3d2 (patch)
tree5742705a014d5c1f57557af6713c0462a495a575 /program/include/rcube_imap.php
parent05134125b2e639e62535944d05fe9b7796a7f176 (diff)
Moved RoundCube functionality from lib to rcube_imap class; removed debug log
Diffstat (limited to 'program/include/rcube_imap.php')
-rw-r--r--program/include/rcube_imap.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index f228a5364..e9aee3772 100644
--- a/program/include/rcube_imap.php
+++ b/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)