summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRobin McCorkell <rmccorkell@karoshi.org.uk>2015-07-15 22:55:30 +0100
committerRobin McCorkell <rmccorkell@karoshi.org.uk>2015-07-15 22:55:30 +0100
commite556d97b6472ab32fabf2fbc716b319fbc923ce9 (patch)
treeed8224d5f90eaed978835547769381aa3c5999b0 /lib
parent7830434d784ee85507a53499906cee8dbc232ae1 (diff)
downloadnextcloud-server-e556d97b6472ab32fabf2fbc716b319fbc923ce9.tar.gz
nextcloud-server-e556d97b6472ab32fabf2fbc716b319fbc923ce9.zip
Fix memcache factory creation when not installed
Memcache factory expects a class name, not an instantiated object
Diffstat (limited to 'lib')
-rw-r--r--lib/private/server.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/private/server.php b/lib/private/server.php
index a3043f943ca..53949b53df7 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) {