Merge pull request #33749 from nextcloud/backport/33734/stable24

[stable24] remove leading slash for search results at mountpoint root
nextcloud · Sep 1, 2022 · e76bb27 · e76bb27
2 parents 482671e + ee8cabe
commit e76bb27
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/private/Files/Node/Folder.php b/lib/private/Files/Node/Folder.php
@@ -296,7 +296,7 @@ public function search($query) {
 
 	private function cacheEntryToFileInfo(IMountPoint $mount, string $appendRoot, ICacheEntry $cacheEntry): FileInfo {
 		$cacheEntry['internalPath'] = $cacheEntry['path'];
-		$cacheEntry['path'] = $appendRoot . $cacheEntry->getPath();
+		$cacheEntry['path'] = rtrim($appendRoot . $cacheEntry->getPath(), '/');
 		$subPath = $cacheEntry['path'] !== '' ? '/' . $cacheEntry['path'] : '';
 		return new \OC\Files\FileInfo($this->path . $subPath, $mount->getStorage(), $cacheEntry['internalPath'], $cacheEntry, $mount);
 	}