From bf0cb98701a616ea78ffe2579d9e2efa1ae9d3d2 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 27 May 2008 02:41:46 -0400
Subject: [PATCH] Moved RoundCube functionality from lib to rcube_imap class; removed debug log
---
program/include/rcube_imap.php | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index f228a53..e9aee37 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -1414,12 +1414,15 @@
// 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)
--
Gitblit v1.9.1