aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouis <6653109+artonge@users.noreply.github.com>2021-07-29 12:27:19 +0200
committerGitHub <noreply@github.com>2021-07-29 12:27:19 +0200
commitcdcad4e5627813bd1dc1ac1ee184e6d5275f5996 (patch)
tree1aabec5f240fac99b184f8a0c3e40f5b53700742
parent9415eb18888eb3b5a6c045d15e8178056d1f6db6 (diff)
parent305ed16b0b0bfe78e2e3d48000a399741cfe0c9d (diff)
downloadnextcloud-server-cdcad4e5627813bd1dc1ac1ee184e6d5275f5996.tar.gz
nextcloud-server-cdcad4e5627813bd1dc1ac1ee184e6d5275f5996.zip
Merge pull request #28192 from nextcloud/backport/28173/stable21
[stable21] Fix variable override in file view
-rw-r--r--apps/files/lib/Controller/ViewController.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
index da828cc6074..a4cb8ec0c11 100644
--- a/apps/files/lib/Controller/ViewController.php
+++ b/apps/files/lib/Controller/ViewController.php
@@ -214,17 +214,17 @@ class ViewController extends Controller {
$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'
];