From 22a41b824715cebb7a6874f1a869d1afde8d9cfc Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 26 May 2013 05:11:49 -0400
Subject: [PATCH] Make possible to disable shared cache
---
program/lib/Roundcube/rcube.php | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php
index 78d7959..4471ace 100644
--- a/program/lib/Roundcube/rcube.php
+++ b/program/lib/Roundcube/rcube.php
@@ -269,16 +269,18 @@
{
$shared_name = "shared_$name";
- if (!isset($this->caches[$shared_name])) {
+ if (!array_key_exists($shared_name, $this->caches)) {
$opt = strtolower($name) . '_cache';
$type = $this->config->get($opt);
$ttl = $this->config->get($opt . '_ttl');
if (!$type) {
- $type = $this->config->get('shared_cache');
+ // cache is disabled
+ return $this->caches[$shared_name] = null;
}
+
if ($ttl === null) {
- $ttl = $this->config->get('shared_cache_ttl');
+ $ttl = $this->config->get('shared_cache_ttl', '10d');
}
$this->caches[$shared_name] = new rcube_cache_shared($type, $name, $ttl, $packed);
--
Gitblit v1.9.1