aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acm/acm_memcache.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-12-16 15:48:23 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-12-16 15:48:23 +0000
commitb68de2323d6444b4b3685a98bbcb9500a38e45cb (patch)
tree6046a64891cfc1c2edb3f4b42b0e799f2921c155 /phpBB/includes/acm/acm_memcache.php
parent51d173ff1e6d3764be4701b92ecfd68007ad1c81 (diff)
downloadforums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar
forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar.gz
forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar.bz2
forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar.xz
forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.zip
merge changes from 3.0.x branch
git-svn-id: file:///svn/phpbb/trunk@10342 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acm/acm_memcache.php')
-rw-r--r--phpBB/includes/acm/acm_memcache.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/acm/acm_memcache.php b/phpBB/includes/acm/acm_memcache.php
index 3077ee9615..52b8832749 100644
--- a/phpBB/includes/acm/acm_memcache.php
+++ b/phpBB/includes/acm/acm_memcache.php
@@ -105,7 +105,11 @@ class acm extends acm_memory
*/
function _write($var, $data, $ttl = 2592000)
{
- return $this->memcache->set($this->key_prefix . $var, $data, $this->flags, $ttl);
+ if (!$this->memcache->replace($this->key_prefix . $var, $data, $this->flags, $ttl))
+ {
+ return $this->memcache->set($this->key_prefix . $var, $data, $this->flags, $ttl);
+ }
+ return true;
}
/**