Changeset 4784 in subversion

Timestamp:

May 18, 2011 8:10:27 AM (2 years ago)

Author:

alec

Message:

• Make memcached cache not system-wide

File:

• trunk/roundcubemail/program/include/rcube_cache.php (modified) (4 diffs)

trunk/roundcubemail/program/include/rcube_cache.php

@@ -209 +209 @@
 
         if ($this->type == 'memcache') {
-            $data = $this->db->get($key);
+            $data = $this->db->get($this->mc_key($key));
                 
             if ($data) {
@@ -264 +264 @@
 
         if ($this->type == 'memcache') {
+            $key = $this->mc_key($key);
             $result = $this->db->replace($key, $data, MEMCACHE_COMPRESSED);
             if (!$result)
@@ -314 +315 @@
 
         if ($this->type == 'memcache') {
-            return $this->db->delete($key);
+            return $this->db->delete($this->mc_key($key));
         }
 
@@ -326 +327 @@
     }
 
+
+    /**
+     * Creates per-user Memcache key
+     *
+     * @param string $key Cache key
+     * @access private
+     */
+    private function mc_key($key)
+    {
+        return sprintf('[%d]%s', $this->userid, $key);
+    }
 }