summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@owncloud.com>2013-08-15 03:34:43 +0200
committerAndreas Fischer <bantu@owncloud.com>2013-08-15 03:34:43 +0200
commit8d762f659a24a6b133d6bd4ca1cc2030bdce5ab0 (patch)
tree9b649f2b2ea4234e83abcabf2b27346a7308aa6f /lib
parentfb2761a2034ed3ae786145418a6ca0b0262ef393 (diff)
downloadnextcloud-server-8d762f659a24a6b133d6bd4ca1cc2030bdce5ab0.tar.gz
nextcloud-server-8d762f659a24a6b133d6bd4ca1cc2030bdce5ab0.zip
Allow usage of xCache variable cache if xcache_unset_by_prefix() is present.
Diffstat (limited to 'lib')
-rw-r--r--lib/memcache/xcache.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/memcache/xcache.php b/lib/memcache/xcache.php
index e0acb11b054..91b9810cc6b 100644
--- a/lib/memcache/xcache.php
+++ b/lib/memcache/xcache.php
@@ -53,8 +53,10 @@ class XCache extends Cache {
if (\OC::$CLI) {
return false;
}
- // as soon as admin auth is enabled we can run into issues with admin ops like xcache_clear_cache
- if (ini_get('xcache.admin.enable_auth')) {
+ if (!function_exists('xcache_unset_by_prefix') && ini_get('xcache.admin.enable_auth')) {
+ // We do not want to use xCache if we can not clear it without
+ // using the administration function xcache_clear_cache()
+ // AND administration functions are password-protected.
return false;
}