diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2017-01-27 10:14:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-27 10:14:22 +0100 |
| commit | b5990b740d1208ee3c465fe49ca08d27855c35a6 (patch) | |
| tree | d36011c8a031d312d1caebc4e81395de45c41776 /lib | |
| parent | 98dc58356f8035e0e3fb33d77f1064f1c6208258 (diff) | |
| parent | 77577b952b06bb134562c081629f499d69f30c73 (diff) | |
| download | nextcloud-server-b5990b740d1208ee3c465fe49ca08d27855c35a6.tar.gz nextcloud-server-b5990b740d1208ee3c465fe49ca08d27855c35a6.zip | |
Merge pull request #3046 from nextcloud/issue-2190-imagepath-is-root-sensitive
Make sure different webroots use different cached paths
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Server.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Server.php b/lib/private/Server.php index 8528d5e7b32..a514534049d 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -377,7 +377,7 @@ class Server extends ServerContainer implements IServerContainer { $version = implode(',', $v); $instanceId = \OC_Util::getInstanceId(); $path = \OC::$SERVERROOT; - $prefix = md5($instanceId . '-' . $version . '-' . $path); + $prefix = md5($instanceId . '-' . $version . '-' . $path . '-' . \OC::$WEBROOT); return new \OC\Memcache\Factory($prefix, $c->getLogger(), $config->getSystemValue('memcache.local', null), $config->getSystemValue('memcache.distributed', null), |