Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLouis <6653109+artonge@users.noreply.github.com>2021-07-29 11:06:32 +0300
committerGitHub <noreply@github.com>2021-07-29 11:06:32 +0300
commite8753a5734072d236c20d588102b5cf987476497 (patch)
tree95779d52885c5f732b6189b6ae2c02282791e880
parent103a0beee367021b37db56388411a7588dcc2554 (diff)
parentf5d4846c142f3b8649c7deb37f76685a488b3b66 (diff)
Merge pull request #28191 from nextcloud/backport/28173/stable20
[stable20] 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 1568e0c9f54..158b454c792 100644
--- a/apps/files/lib/Controller/ViewController.php
+++ b/apps/files/lib/Controller/ViewController.php
@@ -204,17 +204,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'
];