Remove the static dependency on OC_Util from Memcache

2 files changed, 14 insertions, 1 deletions

diff --git a/lib/private/memcache/cache.php b/lib/private/memcache/cache.php
index 0ad1cc7ec03..03671b3f240 100644
--- a/lib/private/memcache/cache.php
+++ b/lib/private/memcache/cache.php
@@ -18,7 +18,7 @@ abstract class Cache implements \ArrayAccess {
 	 * @param string $prefix
 	 */
 	public function __construct($prefix = '') {
-		$this->prefix = \OC_Util::getInstanceId() . '/' . $prefix;
+		$this->prefix = $prefix;
 	}
 
 	public function getPrefix() {
diff --git a/lib/private/memcache/factory.php b/lib/private/memcache/factory.php
index fde7d947567..48c97b59551 100644
--- a/lib/private/memcache/factory.php
+++ b/lib/private/memcache/factory.php
@@ -10,12 +10,25 @@ namespace OC\Memcache;
 
 class Factory {
 	/**
+	 * @var string $globalPrefix
+	 */
+	private $globalPrefix;
+
+	/**
+	 * @param string $globalPrefix
+	 */
+	public function __construct($globalPrefix) {
+		$this->globalPrefix = $globalPrefix;
+	}
+
+	/**
 	 * get a cache instance, will return null if no backend is available
 	 *
 	 * @param string $prefix
 	 * @return \OC\Memcache\Cache
 	 */
 	function create($prefix = '') {
+		$prefix = $this->globalPrefix . '/' . $prefix;
 		if (XCache::isAvailable()) {
 			return new XCache($prefix);
 		} elseif (APCu::isAvailable()) {