From 0b2ce91f25aed4c174c437e679155d30bd0387bf Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 05 Jun 2009 12:13:24 -0400
Subject: [PATCH] - Reviewed/fixed skip_deleted/read_when_deleted/flag_for_deletion options handling in UI
---
program/include/rcube_imap.php | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 1e2ac00..7b24d23 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -303,7 +303,7 @@
if (is_array($str) && $msgs == null)
list($str, $msgs, $charset, $sort_field) = $str;
if ($msgs != null && !is_array($msgs))
- $msgs = split(',', $msgs);
+ $msgs = explode(',', $msgs);
$this->search_string = $str;
$this->search_set = $msgs;
@@ -1627,13 +1627,9 @@
// send expunge command in order to have the moved message
// really deleted from the source mailbox
if ($moved) {
- // but only when flag_for_deletion is set to false
- if (!rcmail::get_instance()->config->get('flag_for_deletion', false))
- {
- $this->_expunge($from_mbox, FALSE, $a_uids);
- $this->_clear_messagecount($from_mbox);
- $this->_clear_messagecount($to_mbox);
- }
+ $this->_expunge($from_mbox, FALSE, $a_uids);
+ $this->_clear_messagecount($from_mbox);
+ $this->_clear_messagecount($to_mbox);
}
// moving failed
else if (rcmail::get_instance()->config->get('delete_always', false)) {
--
Gitblit v1.9.1