From 08df33b5c25577cf42d7f524eeaa367cbde886fb Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 15 Oct 2012 09:38:13 -0400
Subject: [PATCH] Partially revert 9546d22c6: don't validate with parse_charset()

---
 program/include/rcube_cache.php |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/program/include/rcube_cache.php b/program/include/rcube_cache.php
index 01f6203..4e60dea 100644
--- a/program/include/rcube_cache.php
+++ b/program/include/rcube_cache.php
@@ -33,9 +33,9 @@
 class rcube_cache
 {
     /**
-     * Instance of rcube_mdb2 or Memcache class
+     * Instance of database handler
      *
-     * @var rcube_mdb2/Memcache
+     * @var rcube_db|Memcache|bool
      */
     private $db;
     private $type;
@@ -45,7 +45,6 @@
     private $packed;
     private $index;
     private $cache         = array();
-    private $cache_keys    = array();
     private $cache_changes = array();
     private $cache_sums    = array();
 
@@ -167,7 +166,7 @@
             $this->cache         = array();
             $this->cache_changed = false;
             $this->cache_changes = array();
-            $this->cache_keys    = array();
+            $this->cache_sums    = array();
         }
         // Remove keys by name prefix
         else if ($prefix_mode) {
@@ -175,7 +174,7 @@
                 if (strpos($k, $key) === 0) {
                     $this->cache[$k] = null;
                     $this->cache_changes[$k] = false;
-                    unset($this->cache_keys[$k]);
+                    unset($this->cache_sums[$k]);
                 }
             }
         }
@@ -183,7 +182,7 @@
         else {
             $this->cache[$key] = null;
             $this->cache_changes[$key] = false;
-            unset($this->cache_keys[$key]);
+            unset($this->cache_sums[$key]);
         }
 
         // Remove record(s) from the backend
@@ -255,7 +254,7 @@
             }
             else if ($this->type == 'apc') {
                 $data = apc_fetch($this->ckey($key));
-	        }
+            }
 
             if ($data) {
                 $md5sum = md5($data);
@@ -274,7 +273,7 @@
         }
         else {
             $sql_result = $this->db->limitquery(
-                "SELECT cache_id, data, cache_key".
+                "SELECT data, cache_key".
                 " FROM ".$this->db->table_name('cache').
                 " WHERE user_id = ?".
                 " AND cache_key = ?".
@@ -295,8 +294,7 @@
                 }
 
                 $this->cache[$key]      = $data;
-	            $this->cache_sums[$key] = $md5sum;
-                $this->cache_keys[$key] = $sql_arr['cache_id'];
+                $this->cache_sums[$key] = $md5sum;
             }
             else {
                 $this->cache[$key] = null;
@@ -325,7 +323,7 @@
             return $this->add_record($this->ckey($key), $data);
         }
 
-        $key_exists = $this->cache_keys[$key];
+        $key_exists = array_key_exists($key, $this->cache_sums);
         $key        = $this->prefix . '.' . $key;
 
         // Remove NULL rows (here we don't need to check if the record exist)
@@ -465,10 +463,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