summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2007-05-17 15:18:12 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2007-05-17 15:18:12 +0000
commit2391085a38d016c2a13473e4c427b3915549fd1d (patch)
treedeb12fb8826e61c2b142de4a7b01090e98cf6fa0
parent1cfb015c5bf2fd4989dfed76ee5fea752c187212 (diff)
Always respect 'enable_caching' config param
git-svn-id: https://svn.roundcube.net/trunk@561 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/program/include/rcube_imap.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/program/include/rcube_imap.inc b/roundcubemail/program/include/rcube_imap.inc
index c0016d332..dc18454c5 100644
--- a/roundcubemail/program/include/rcube_imap.inc
+++ b/roundcubemail/program/include/rcube_imap.inc
@@ -1999,7 +1999,7 @@ class rcube_imap
static $sa_message_index = array();
// empty key -> empty array
- if (empty($key))
+ if (!$this->caching_enabled || empty($key))
return array();
if (!empty($sa_message_index[$key]) && !$force)
@@ -2024,7 +2024,7 @@ class rcube_imap
function add_message_cache($key, $index, $headers, $struct=null)
{
- if (empty($key) || !is_object($headers) || empty($headers->uid))
+ if (!$this->caching_enabled || empty($key) || !is_object($headers) || empty($headers->uid))
return;
// check for an existing record (probly headers are cached but structure not)