Changeset fa2173c in github

Timestamp:

Oct 26, 2010 8:17:55 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:

10a6fc58

Parents:

4757608

Message:

• Fix: Use internal instead of DB cache in message_index() and thread_index()

File:

• program/include/rcube_imap.php (modified) (10 diffs)

program/include/rcube_imap.php

@@ -1260 +1260 @@
 
         // we have a saved search result, get index from there
-        if (!isset($this->cache[$key]) && $this->search_string
+        if (!isset($this->icache[$key]) && $this->search_string
             && !$this->search_threads && $mailbox == $this->mailbox) {
             // use message index sort as default sorting
@@ -1270 +1270 @@
 
                 if ($this->sort_order == 'DESC')
-                    $this->cache[$key] = array_reverse($msgs);
+                    $this->icache[$key] = array_reverse($msgs);
                 else
-                    $this->cache[$key] = $msgs;
+                    $this->icache[$key] = $msgs;
             }
             // sort with SORT command
@@ -1280 +1280 @@
 
                 if ($this->sort_order == 'DESC')
-                    $this->cache[$key] = array_reverse($this->search_set);
+                    $this->icache[$key] = array_reverse($this->search_set);
                 else
-                    $this->cache[$key] = $this->search_set;
+                    $this->icache[$key] = $this->search_set;
             }
             else {
@@ -1294 +1294 @@
                         arsort($a_index);
 
-                    $this->cache[$key] = array_keys($a_index);
+                    $this->icache[$key] = array_keys($a_index);
                 }
                 else {
-                    $this->cache[$key] = array();
+                    $this->icache[$key] = array();
                 }
             }
@@ -1303 +1303 @@
 
         // have stored it in RAM
-        if (isset($this->cache[$key]))
-            return $this->cache[$key];
+        if (isset($this->icache[$key]))
+            return $this->icache[$key];
 
         // check local cache
@@ -1328 +1328 @@
                 $a_index = array_reverse($a_index);
 
-            $this->cache[$key] = $a_index;
+            $this->icache[$key] = $a_index;
         }
         // fetch complete message index
@@ -1338 +1338 @@
                 $a_index = array_reverse($a_index);
 
-            $this->cache[$key] = $a_index;
+            $this->icache[$key] = $a_index;
         }
         else if ($a_index = $this->conn->fetchHeaderIndex(
@@ -1347 +1347 @@
                 arsort($a_index);
 
-            $this->cache[$key] = array_keys($a_index);
-        }
-
-        return $this->cache[$key] !== false ? $this->cache[$key] : array();
+            $this->icache[$key] = array_keys($a_index);
+        }
+
+        return $this->icache[$key] !== false ? $this->icache[$key] : array();
     }
 
@@ -1370 +1370 @@
 
         // we have a saved search result, get index from there
-        if (!isset($this->cache[$key]) && $this->search_string
+        if (!isset($this->icache[$key]) && $this->search_string
             && $this->search_threads && $mailbox == $this->mailbox) {
             // use message IDs for better performance
             $ids = array_keys_recursive($this->search_set['tree']);
-            $this->cache[$key] = $this->_flatten_threads($mailbox, $this->search_set['tree'], $ids);
+            $this->icache[$key] = $this->_flatten_threads($mailbox, $this->search_set['tree'], $ids);
         }
 
         // have stored it in RAM
-        if (isset($this->cache[$key]))
-            return $this->cache[$key];
+        if (isset($this->icache[$key]))
+            return $this->icache[$key];
 /*
         // check local cache
@@ -1394 +1394 @@
         list ($thread_tree) = $this->_fetch_threads($mailbox);
 
-        $this->cache[$key] = $this->_flatten_threads($mailbox, $thread_tree);
-
-        return $this->cache[$key];
+        $this->icache[$key] = $this->_flatten_threads($mailbox, $thread_tree);
+
+        return $this->icache[$key];
     }