Merge pull request #33734 from nextcloud/search-result-leading-slash

juliusknorr · web-flow · commit 5f0c21c4c005 · 2022-08-30T12:18:54.000+02:00
diff --git a/lib/private/Files/Node/Folder.php b/lib/private/Files/Node/Folder.php
@@ -298,7 +298,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
`@@ -298,7 +298,7 @@ public function search($query) {`
`298`	`298`
`299`	`299`	`private function cacheEntryToFileInfo(IMountPoint $mount, string $appendRoot, ICacheEntry $cacheEntry): FileInfo {`
`300`	`300`	`$cacheEntry['internalPath'] = $cacheEntry['path'];`
`301`		`- $cacheEntry['path'] = $appendRoot . $cacheEntry->getPath();`
	`301`	`+ $cacheEntry['path'] = rtrim($appendRoot . $cacheEntry->getPath(), '/');`
`302`	`302`	`$subPath = $cacheEntry['path'] !== '' ? '/' . $cacheEntry['path'] : '';`
`303`	`303`	`return new \OC\Files\FileInfo($this->path . $subPath, $mount->getStorage(), $cacheEntry['internalPath'], $cacheEntry, $mount);`
`304`	`304`	`}`