diff options
| author | Robin Appelman <robin@icewind.nl> | 2018-11-28 15:18:29 +0100 |
|---|---|---|
| committer | Robin Appelman <robin@icewind.nl> | 2018-11-28 15:18:29 +0100 |
| commit | 9d9f6903c9e2a94f2a1b230fd35ec586b18b7a77 (patch) | |
| tree | 3b9c04b67037cb4d1397e447a13b2cc563892a13 /lib/private/Files | |
| parent | 802a978bb5c336edc0369335d1aa5d12807d2bcc (diff) | |
| download | nextcloud-server-9d9f6903c9e2a94f2a1b230fd35ec586b18b7a77.tar.gz nextcloud-server-9d9f6903c9e2a94f2a1b230fd35ec586b18b7a77.zip | |
Fix folder path containing leading slash when getting mount root by id
This fixes collabora on public link shared groupfolders
Fixes https://github.com/nextcloud/groupfolders/issues/225
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib/private/Files')
| -rw-r--r-- | lib/private/Files/Node/Folder.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Files/Node/Folder.php b/lib/private/Files/Node/Folder.php index 0eb119eb0de..e35ca85a779 100644 --- a/lib/private/Files/Node/Folder.php +++ b/lib/private/Files/Node/Folder.php @@ -313,7 +313,7 @@ class Folder extends Node implements \OCP\Files\Folder { $internalPath = ltrim($cachedMountInfo->getRootInternalPath() . '/' . $cacheEntry->getPath(), '/'); $pathRelativeToMount = substr($internalPath, strlen($cachedMountInfo->getRootInternalPath())); $pathRelativeToMount = ltrim($pathRelativeToMount, '/'); - $absolutePath = $cachedMountInfo->getMountPoint() . $pathRelativeToMount; + $absolutePath = rtrim($cachedMountInfo->getMountPoint() . $pathRelativeToMount, '/'); return $this->root->createNode($absolutePath, new \OC\Files\FileInfo( $absolutePath, $mount->getStorage(), $cacheEntry->getPath(), $cacheEntry, $mount, \OC::$server->getUserManager()->get($mount->getStorage()->getOwner($pathRelativeToMount)) |