don't use xcache in case admin auth is enabled in php.ini - this can cause issues

1 files changed, 9 insertions, 4 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) {
+		}
+		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;
-		}else{
-			return true;
 		}
+
+		return true;
 	}
 }