diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-03-07 14:10:36 +0300 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2018-03-09 11:24:06 +0300 |
| commit | c4539c34c9ea78f2bc0fa5c038ebad247fd61fdc (patch) | |
| tree | fe39ebc5be9484055b283df13cf0e6e87518dfe7 /lib | |
| parent | d1547ee3b07b6a553dbbb4bcdd03f0d348b23156 (diff) | |
Move base url from global cache prefix to frontend related ones
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Server.php | 6 |
1 files changed, 3 insertions, 3 deletions
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() ); |