mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3046 from nextcloud/issue-2190-imagepath-is-root-sensitive 

Make sure different webroots use different cached paths
This commit is contained in:
Lukas Reschke 2017-01-27 10:14:22 +01:00 committed by GitHub
parent 98dc58356f 77577b952b
commit b5990b740d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/Server.php
View File

@ -377,7 +377,7 @@ class Server extends ServerContainer implements IServerContainer {
$version = implode(',', $v); $version = implode(',', $v);
$instanceId = \OC_Util::getInstanceId(); $instanceId = \OC_Util::getInstanceId();
$path = \OC::$SERVERROOT; $path = \OC::$SERVERROOT;
$prefix = md5($instanceId . '-' . $version . '-' . $path); $prefix = md5($instanceId . '-' . $version . '-' . $path . '-' . \OC::$WEBROOT);
return new \OC\Memcache\Factory($prefix, $c->getLogger(), return new \OC\Memcache\Factory($prefix, $c->getLogger(),
$config->getSystemValue('memcache.local', null), $config->getSystemValue('memcache.local', null),
$config->getSystemValue('memcache.distributed', null), $config->getSystemValue('memcache.distributed', null),