Changeset 5251 in subversion

Timestamp:

Sep 20, 2011 7:55:59 AM (21 months ago)

Author:

alec

Message:

• Fix cached indexes validation after removing messages when skip_deleted=true

File:

• trunk/roundcubemail/program/include/rcube_imap_cache.php (modified) (5 diffs)

trunk/roundcubemail/program/include/rcube_imap_cache.php

@@ -814 +814 @@
 
         // Folder is empty but cache isn't
-        if (empty($mbox_data['EXISTS']) && (!empty($index['seq']) || !empty($index['tree']))) {
-            $this->clear($mailbox);
-            $exists = false;
+        if (empty($mbox_data['EXISTS'])) {
+            if (!empty($index['seq']) || !empty($index['tree'])) {
+                $this->clear($mailbox);
+                $exists = false;
+                return false;
+            }
+        }
+        // Folder is not empty but cache is
+        else if (empty($index['seq']) && empty($index['tree'])) {
+            unset($this->icache[$mailbox][$is_thread ? 'thread' : 'index']);
             return false;
         }
@@ -881 +888 @@
 
                 if (!empty($ids)) {
-                    $index = null; // cache invalid
+                    return false;
                 }
             }
@@ -997 +1004 @@
             $index['modseq'], $qresync);
 
+        $invalidated = false;
+
         if (!empty($result)) {
             foreach ($result as $id => $msg) {
@@ -1003 +1012 @@
                 if ($this->skip_deleted && !empty($msg->flags['DELETED'])) {
                     $this->remove_message($mailbox, $uid);
+
+                    if (!$invalidated) {
+                        $invalidated = true;
+                        // Invalidate thread indexes (?)
+                        $this->remove_thread($mailbox);
+                        // Invalidate index
+                        $index['valid'] = false;
+                    }
                     continue;
                 }
@@ -1037 +1054 @@
                     // Invalidate thread indexes (?)
                     $this->remove_thread($mailbox);
+                    // Invalidate index
+                    $index['valid'] = false;
                 }
             }