From d87fc29fee9e629fad49d956a449ae647c0bc142 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 11 Jun 2008 15:26:08 -0400
Subject: [PATCH] - don't call expunge and don't remove message row after message move   if flag_for_deletion is set to true (#1485002)

---
 program/include/rcube_imap.php |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 9d8f6d3..7f3fd9a 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -1419,9 +1419,13 @@
     // send expunge command in order to have the moved message
     // really deleted from the source mailbox
     if ($moved) {
-      $this->_expunge($from_mbox, FALSE);
-      $this->_clear_messagecount($from_mbox);
-      $this->_clear_messagecount($to_mbox);
+      // 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);
+        $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