From a8e478c07cd0a954e2d061b49a18ee9fc1552f6e Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Thu, 09 Aug 2012 15:25:08 -0400
Subject: [PATCH] Merge branch 'release-0.7' of github.com:roundcube/roundcubemail into release-0.7
---
program/include/rcube_cache.php | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/program/include/rcube_cache.php b/program/include/rcube_cache.php
index 69f5b31..550a148 100644
--- a/program/include/rcube_cache.php
+++ b/program/include/rcube_cache.php
@@ -264,7 +264,7 @@
$this->cache_sums[$key] = $md5sum;
$this->cache[$key] = $data;
}
- else if (!$nostore) {
+ else {
$this->cache[$key] = null;
}
}
@@ -294,7 +294,7 @@
$this->cache_sums[$key] = $md5sum;
$this->cache_keys[$key] = $sql_arr['cache_id'];
}
- else if (!$nostore) {
+ else {
$this->cache[$key] = null;
}
}
@@ -461,10 +461,13 @@
*/
private function delete_record($key, $index=true)
{
- if ($this->type == 'memcache')
- $this->db->delete($this->ckey($key));
- else
+ if ($this->type == 'memcache') {
+ // #1488592: use 2nd argument
+ $this->db->delete($this->ckey($key), 0);
+ }
+ else {
apc_delete($this->ckey($key));
+ }
if ($index) {
if (($idx = array_search($key, $this->index)) !== false) {
--
Gitblit v1.9.1