summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-07-12 08:40:18 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-07-12 16:49:39 +0200
commit5bac9693511ca0e9e5f0553ecc8791cccf05c935 (patch)
tree1aa8a06d19cd0795935be6faab9b80bf26195b1f /apps
parent5470b9521a8f128dba88e441f7147e912c5b48d6 (diff)
downloadnextcloud-server-5bac9693511ca0e9e5f0553ecc8791cccf05c935.tar.gz
nextcloud-server-5bac9693511ca0e9e5f0553ecc8791cccf05c935.zip
Fixed invalid uid
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'apps')
-rw-r--r--apps/files/lib/Controller/ViewController.php2
-rw-r--r--apps/files/templates/appnavigation.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
index 15d9334ed9e..4035837459a 100644
--- a/apps/files/lib/Controller/ViewController.php
+++ b/apps/files/lib/Controller/ViewController.php
@@ -184,7 +184,7 @@ class ViewController extends Controller {
foreach ($favElements['folders'] as $elem) {
$id = substr($elem, strrpos($elem, '/') + 1, strlen($elem));
- $link = $this->urlGenerator->linkToRouteAbsolute('files.view.index', ['dir' => $elem]);
+ $link = $this->urlGenerator->linkToRoute('files.view.index', ['dir' => $elem, 'view' => 'files']);
$sortingValue = ++$currentCount;
$element = [
diff --git a/apps/files/templates/appnavigation.php b/apps/files/templates/appnavigation.php
index 7dfb5630bc1..a3267ab8c1a 100644
--- a/apps/files/templates/appnavigation.php
+++ b/apps/files/templates/appnavigation.php
@@ -67,7 +67,7 @@ function NavigationListElements($item, $l, $pinned) {
strpos($item['classes'], 'pinned') !== false ? $pinned++ : '';
?>
<li <?php if (isset($item['sublist'])){ ?>id="button-collapse-parent-<?php p($item['id']); ?>"<?php } ?>
- data-id="<?php p(isset($item['href']) ? $item['href'] : $item['id']) ?> "
+ data-id="<?php p($item['id']) ?> "
class="nav-<?php p($item['id']) ?> <?php p($item['classes']) ?> <?php p($pinned === 1 ? 'first-pinned' : '') ?> <?php if ($item['defaultExpandedState']) { ?> open<?php } ?>"
<?php if (isset($item['folderPosition'])) { ?> folderposition="<?php p($item['folderPosition']); ?>" <?php } ?>>