Merge pull request #12376 from nextcloud/backport/12284/stable13

rullzer · web-flow · commit b89996483d34 · 2018-11-13T15:59:01.000+01:00
[13] Properly search the root of a shared external storage
diff --git a/lib/private/Files/Cache/Wrapper/CacheJail.php b/lib/private/Files/Cache/Wrapper/CacheJail.php
@@ -93,7 +93,7 @@ protected function formatCacheEntry($entry) {
 
 	protected function filterCacheEntry($entry) {
 		$rootLength = strlen($this->getRoot()) + 1;
-		return ($entry['path'] === $this->getRoot()) or (substr($entry['path'], 0, $rootLength) === $this->getRoot() . '/');
+		return $rootLength === 1 || ($entry['path'] === $this->getRoot()) || (substr($entry['path'], 0, $rootLength) === $this->getRoot() . '/');
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ protected function formatCacheEntry($entry) {`
`93`	`93`
`94`	`94`	`protected function filterCacheEntry($entry) {`
`95`	`95`	`$rootLength = strlen($this->getRoot()) + 1;`
`96`		`- return ($entry['path'] === $this->getRoot()) or (substr($entry['path'], 0, $rootLength) === $this->getRoot() . '/');`
	`96`	`+ return $rootLength === 1 \|\| ($entry['path'] === $this->getRoot()) \|\| (substr($entry['path'], 0, $rootLength) === $this->getRoot() . '/');`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`/**`