summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-08-30 18:05:34 +0000
committeralecpl <alec@alec.pl>2011-08-30 18:05:34 +0000
commit682819f15eb8e6683ddf667232fdfa998571699f (patch)
tree761034b858f4ca30c4661d78a47012878a5a1308
parent8757f5b57d886a0ae6c79b54c4f37e3d7d9b6b4e (diff)
- Fix imap_cache setting to values other than 'db' (#1488060)
-rw-r--r--CHANGELOG1
-rw-r--r--program/include/rcube_imap.php6
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 24a602964..432aa4962 100644
--- a/CHANGELOG
+++ b/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/program/include/rcube_imap.php b/program/include/rcube_imap.php
index a42376863..97b080a74 100644
--- a/program/include/rcube_imap.php
+++ b/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;