- 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)

release-0.6
alecpl 14 years ago
parent b5fb21e767
commit ac3ad69e94

@ -3049,11 +3049,13 @@ class rcube_imap
*/
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)) {

@ -231,7 +231,7 @@ function rcube_subscription_form($attrib)
}
// get folders from server
$IMAP->clear_cache('mailboxes');
$IMAP->clear_cache('/^mailboxes.*/', true);
$a_unsubscribed = $IMAP->list_unsubscribed();
$a_subscribed = $IMAP->list_mailboxes();

Loading…
Cancel
Save