Changeset 4743 in subversion

Timestamp:

May 9, 2011 4:32:13 AM (2 years ago)

Author:

alec

Message:

• Fix possible ambiguity in folders caching (when list_mailboxes() was called the same result was returned, no matter what was the 1st and 2nd argument)

Location:

trunk/roundcubemail/program

Files:

• include/rcube_imap.php (modified) (1 diff)
• steps/settings/folders.inc (modified) (1 diff)

trunk/roundcubemail/program/include/rcube_imap.php

@@ -3050 +3050 @@
     private function _list_mailboxes($root='', $name='*', $filter=null)
     {
-        $cache_key = 'mailboxes';
+        $cache_key = $root.':'.$name;
         if (!empty($filter)) {
-            $cache_key .= '.'.substr((is_string($filter) ? $filter : serialize($filter)), 0, 90);
-        }
+            $cache_key .= ':'.(is_string($filter) ? $filter : serialize($filter));
+        }
+
+        $cache_key = 'mailboxes.'.md5($cache_key);
 
         // get cached folder list

trunk/roundcubemail/program/steps/settings/folders.inc

@@ -232 +232 @@
 
     // get folders from server
-    $IMAP->clear_cache('mailboxes');
+    $IMAP->clear_cache('/^mailboxes.*/', true);
 
     $a_unsubscribed = $IMAP->list_unsubscribed();