From e556d97b6472ab32fabf2fbc716b319fbc923ce9 Mon Sep 17 00:00:00 2001 From: Robin McCorkell Date: Wed, 15 Jul 2015 22:55:30 +0100 Subject: [PATCH] Fix memcache factory creation when not installed Memcache factory expects a class name, not an instantiated object --- lib/private/server.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/private/server.php b/lib/private/server.php index a3043f943c..53949b53df 100644 --- a/lib/private/server.php +++ b/lib/private/server.php @@ -50,7 +50,6 @@ use OC\Http\Client\ClientService; use OC\Lock\MemcacheLockingProvider; use OC\Lock\NoopLockingProvider; use OC\Mail\Mailer; -use OC\Memcache\ArrayCache; use OC\Memcache\NullCache; use OC\Security\CertificateManager; use OC\Security\Crypto; @@ -242,9 +241,9 @@ class Server extends SimpleContainer implements IServerContainer { } return new \OC\Memcache\Factory('', $c->getLogger(), - new ArrayCache(), - new ArrayCache(), - new ArrayCache() + '\\OC\\Memcache\\ArrayCache', + '\\OC\\Memcache\\ArrayCache', + '\\OC\\Memcache\\ArrayCache' ); }); $this->registerService('ActivityManager', function (Server $c) {