Changeset 1394450

Timestamp:

04/13/2016 05:08:46 PM (9 years ago)

Author:

andy

Message:

memcached: insert delimiter after key salt and make the salt mutable

File:

• memcached/trunk/object-cache.php (modified) (3 diffs)

memcached/trunk/object-cache.php

@@ -272 +272 @@
             $group = 'default';
 
+        $prefix = $this->key_salt;
+
         if ( false !== array_search($group, $this->global_groups) )
-            $prefix = $this->global_prefix;
+            $prefix .= $this->global_prefix;
         else
-            $prefix = $this->blog_prefix;
-
-        return preg_replace('/\s+/', '', WP_CACHE_KEY_SALT . "$prefix$group:$key");
+            $prefix .= $this->blog_prefix;
+
+        return preg_replace('/\s+/', '', "$prefix$group:$key");
     }
 
@@ -366 +368 @@
     function failure_callback($host, $port) {
         //error_log("Connection failure for $host:$port\n", 3, '/tmp/memcached.txt');
+    }
+
+    function salt_keys( $key_salt ) {
+        if ( strlen( $key_salt ) )
+            $this->key_salt = $key_salt . ':';
+        else
+            $this->key_salt = '';
     }
 
@@ -407 +416 @@
         }
 
+        $this->salt_keys( WP_CACHE_KEY_SALT );
+
         $this->cache_hits =& $this->stats['get'];
         $this->cache_misses =& $this->stats['add'];