diff options
author | alecpl <alec@alec.pl> | 2011-08-31 12:49:44 +0000 |
---|---|---|
committer | alecpl <alec@alec.pl> | 2011-08-31 12:49:44 +0000 |
commit | b08caf5813c43e8648cdf5db1e003b3046a37c2c (patch) | |
tree | e87f3c8cd0802c550459f26de1473bbcd4107131 /program/include/rcube_imap.php | |
parent | fd6146b6780c526a04682cda89b133e2d9bbd910 (diff) |
- Applied fixes from trunk up to r5150
Diffstat (limited to 'program/include/rcube_imap.php')
-rw-r--r-- | program/include/rcube_imap.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php index 6a35af0a8..1b311127c 100644 --- a/program/include/rcube_imap.php +++ b/program/include/rcube_imap.php @@ -3074,6 +3074,9 @@ class rcube_imap if (isset($data['folders'])) { $a_folders = $data['folders']; } + else if (!$this->conn->connected()) { + return array(); + } else { // Server supports LIST-EXTENDED, we can use selection options $config = rcmail::get_instance()->config; @@ -3834,13 +3837,13 @@ class rcube_imap /** * Enable or disable indexes caching * - * @param boolean $type Cache type (@see rcmail::get_cache) + * @param string $type Cache type (@see rcmail::get_cache) * @access public */ function set_caching($type) { if ($type) { - $this->caching = true; + $this->caching = $type; } else { if ($this->cache) @@ -3857,7 +3860,7 @@ class rcube_imap { if ($this->caching && !$this->cache) { $rcmail = rcmail::get_instance(); - $this->cache = $rcmail->get_cache('IMAP', $type); + $this->cache = $rcmail->get_cache('IMAP', $this->caching); } return $this->cache; |