Merge pull request #28192 from nextcloud/backport/28173/stable21

[stable21] Fix variable override in file view
nextcloud · Jul 29, 2021 · cdcad4e · cdcad4e
2 parents 9415eb1 + 305ed16
commit cdcad4e
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
@@ -214,17 +214,17 @@ public function index($dir = '', $view = '', $fileid = null, $fileNotFound = fal
 
 		$navBarPositionPosition = 6;
 		$currentCount = 0;
-		foreach ($favElements['folders'] as $dir) {
-			$link = $this->urlGenerator->linkToRoute('files.view.index', ['dir' => $dir, 'view' => 'files']);
+		foreach ($favElements['folders'] as $favElement) {
+			$link = $this->urlGenerator->linkToRoute('files.view.index', ['dir' => $favElement, 'view' => 'files']);
 			$sortingValue = ++$currentCount;
 			$element = [
-				'id' => str_replace('/', '-', $dir),
+				'id' => str_replace('/', '-', $favElement),
 				'view' => 'files',
 				'href' => $link,
-				'dir' => $dir,
+				'dir' => $favElement,
 				'order' => $navBarPositionPosition,
 				'folderPosition' => $sortingValue,
-				'name' => basename($dir),
+				'name' => basename($favElement),
 				'icon' => 'files',
 				'quickaccesselement' => 'true'
 			];