From 1cb6e91e998d861c8e6b67cfc9bf83108331ca50 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 27 May 2015 07:38:55 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
program/lib/Roundcube/rcube_cache_shared.php | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/program/lib/Roundcube/rcube_cache_shared.php b/program/lib/Roundcube/rcube_cache_shared.php
index bd5fb6e..15c30fd 100644
--- a/program/lib/Roundcube/rcube_cache_shared.php
+++ b/program/lib/Roundcube/rcube_cache_shared.php
@@ -464,7 +464,7 @@
/**
* Adds entry into memcache/apc DB.
*
- * @param string $key Cache key name
+ * @param string $key Cache internal key name
* @param mixed $data Serialized cache data
*
* @param boolean True on success, False on failure
@@ -497,7 +497,7 @@
/**
* Deletes entry from memcache/apc DB.
*
- * @param string $key Cache key name
+ * @param string $key Cache internal key name
*
* @param boolean True on success, False on failure
*/
@@ -505,14 +505,14 @@
{
if ($this->type == 'memcache') {
// #1488592: use 2nd argument
- $result = $this->db->delete($ckey, 0);
+ $result = $this->db->delete($key, 0);
}
else {
- $result = apc_delete($ckey);
+ $result = apc_delete($key);
}
if ($this->debug) {
- $this->debug('delete', $ckey, null, $result);
+ $this->debug('delete', $key, null, $result);
}
return $result;
--
Gitblit v1.9.1