From ac3ad69e941c0bcece827e148522a0b78aed25b3 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 09 May 2011 04:32:13 -0400
Subject: [PATCH] - 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)
---
program/steps/settings/folders.inc | 2 +-
program/include/rcube_imap.php | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index fbdaf34..ab2bc2a 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -3049,11 +3049,13 @@
*/
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
$a_mboxes = $this->get_cache($cache_key);
if (is_array($a_mboxes)) {
diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc
index c4c221f..bc95c75 100644
--- a/program/steps/settings/folders.inc
+++ b/program/steps/settings/folders.inc
@@ -231,7 +231,7 @@
}
// get folders from server
- $IMAP->clear_cache('mailboxes');
+ $IMAP->clear_cache('/^mailboxes.*/', true);
$a_unsubscribed = $IMAP->list_unsubscribed();
$a_subscribed = $IMAP->list_mailboxes();
--
Gitblit v1.9.1