diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-08-30 18:05:34 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-08-30 18:05:34 +0000 |
| commit | 16f6adf86180c076b9ad02a7fe71908939317a39 (patch) | |
| tree | d64b10c2722902ff9515ad636a04e73d066e369b | |
| parent | 13693a2aaacf84a3ae04a23baa590394864ed0a4 (diff) | |
- Fix imap_cache setting to values other than 'db' (#1488060)
git-svn-id: https://svn.roundcube.net/trunk@5150 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_imap.php | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 24a602964..432aa4962 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix imap_cache setting to values other than 'db' (#1488060) - Fix handling of attachments inside message/rfc822 parts (#1488026) - Make list of mimetypes that open in preview window configurable (#1487625) - Added plugin hook 'message_part_get' for attachment downloads diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php index a42376863..97b080a74 100644 --- a/roundcubemail/program/include/rcube_imap.php +++ b/roundcubemail/program/include/rcube_imap.php @@ -3837,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) @@ -3860,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; |