Changeset f1ce516 in github

Timestamp:

Mar 4, 2010 10:34:32 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

c1db394b

Parents:

a039c62

Message:

• Fix inconsistent behaviour of 'delete_always' option (#1486299)

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (1 diff)
• program/include/rcube_imap.php (modified) (2 diffs)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix inconsistent behaviour of 'delete_always' option (#1486299)
 - Fix deleting all messages from last list page (#1486293)
 - Flag original messages when sending a draft (#1486203)

config/main.inc.php.dist

@@ -362 +362 @@
 /**
  * 'Delete always'
- * This setting reflects if mail should be always marked as deleted,
- * even if moving to "Trash" fails. This is necessary in some setups
- * because a) people may not have a Trash folder or b) they are over
- * quota (and Trash is included in the quota).
- *
- * This is a failover setting for iil_C_Move when a message is moved
- * to the Trash.
+ * This setting reflects if mail should be always deleted
+ * when moving to Trash fails. This is necessary in some setups
+ * when user is over quota and Trash is included in the quota.
  */
 $rcmail_config['delete_always'] = false;

program/include/rcube_imap.php

@@ -1794 +1794 @@
     $iil_move = iil_C_Move($this->conn, join(',', $a_uids), $from_mbox, $to_mbox);
     $moved = !($iil_move === false || $iil_move < 0);
-    
+
     // send expunge command in order to have the moved message
     // really deleted from the source mailbox
@@ -1803 +1803 @@
     }
     // moving failed
-    else if (rcmail::get_instance()->config->get('delete_always', false)) {
-      return iil_C_Delete($this->conn, $from_mbox, join(',', $a_uids));
+    else if ($config->get('delete_always', false) && $tbox == $config->get('trash_mbox')) {
+      return $this->delete_message($a_uids, $fbox);
     }