From c84171cec0669dbe459ea2b5daf573a50f20e314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Fri, 9 Aug 2013 22:14:28 +0200 Subject: [PATCH] don't use xcache in case admin auth is enabled in php.ini - this can cause issues --- lib/memcache/xcache.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/memcache/xcache.php b/lib/memcache/xcache.php index 33de30562f9..7880518fd9f 100644 --- a/lib/memcache/xcache.php +++ b/lib/memcache/xcache.php @@ -10,7 +10,7 @@ namespace OC\Memcache; class XCache extends Cache { /** - * entries in XCache gets namespaced to prevent collisions between owncloud instances and users + * entries in XCache gets namespaced to prevent collisions between ownCloud instances and users */ protected function getNameSpace() { return $this->prefix; @@ -44,11 +44,16 @@ class XCache extends Cache { static public function isAvailable(){ if (!extension_loaded('xcache')) { return false; - } elseif (\OC::$CLI) { - return false; - }else{ - return true; } + 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')) { + return false; + } + + return true; } }