From c4539c34c9ea78f2bc0fa5c038ebad247fd61fdc Mon Sep 17 00:00:00 2001 From: Julius Härtl Date: Wed, 7 Mar 2018 12:10:36 +0100 Subject: Move base url from global cache prefix to frontend related ones MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/private/Server.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/private/Server.php b/lib/private/Server.php index eae9c9d5a79..44c107e0cf2 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -496,7 +496,7 @@ class Server extends ServerContainer implements IServerContainer { $version = implode(',', $v); $instanceId = \OC_Util::getInstanceId(); $path = \OC::$SERVERROOT; - $prefix = md5($instanceId . '-' . $version . '-' . $path . '-' . $urlGenerator->getBaseUrl()); + $prefix = md5($instanceId . '-' . $version . '-' . $path); return new \OC\Memcache\Factory($prefix, $c->getLogger(), $config->getSystemValue('memcache.local', null), $config->getSystemValue('memcache.distributed', null), @@ -963,7 +963,7 @@ class Server extends ServerContainer implements IServerContainer { $c->getConfig(), $c->getThemingDefaults(), \OC::$SERVERROOT, - $cacheFactory->createDistributed('SCSS') + $cacheFactory->createDistributed('SCSS-' . md5($this->getURLGenerator()->getBaseUrl())) ); }); $this->registerService(JSCombiner::class, function (Server $c) { @@ -972,7 +972,7 @@ class Server extends ServerContainer implements IServerContainer { return new JSCombiner( $c->getAppDataDir('js'), $c->getURLGenerator(), - $cacheFactory->createDistributed('JS'), + $cacheFactory->createDistributed('JS-' . md5($this->getURLGenerator()->getBaseUrl())), $c->getSystemConfig(), $c->getLogger() ); -- cgit v1.2.3