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

PVince81 · web-flow · commit e76bb271ec4e · 2022-09-01T09:27:59.000+02:00
[stable24] remove leading slash for search results at mountpoint root
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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ public function search($query) {`
`296`	`296`
`297`	`297`	`private function cacheEntryToFileInfo(IMountPoint $mount, string $appendRoot, ICacheEntry $cacheEntry): FileInfo {`
`298`	`298`	`$cacheEntry['internalPath'] = $cacheEntry['path'];`
`299`		`- $cacheEntry['path'] = $appendRoot . $cacheEntry->getPath();`
	`299`	`+ $cacheEntry['path'] = rtrim($appendRoot . $cacheEntry->getPath(), '/');`
`300`	`300`	`$subPath = $cacheEntry['path'] !== '' ? '/' . $cacheEntry['path'] : '';`
`301`	`301`	`return new \OC\Files\FileInfo($this->path . $subPath, $mount->getStorage(), $cacheEntry['internalPath'], $cacheEntry, $mount);`
`302`	`302`	`}`