From b578fd855e6b3e7b4b2d1b02357605d65fa0c32b Mon Sep 17 00:00:00 2001
From: Daniel Kesselberg <mail@danielkesselberg.de>
Date: Mon, 25 Feb 2019 14:49:51 +0100
Subject: [PATCH] Generate id for navigation item
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
---
lib/private/NavigationManager.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/private/NavigationManager.php b/lib/private/NavigationManager.php
index a1d3d252af1..2c41fbd88c2 100644
--- a/lib/private/NavigationManager.php
+++ b/lib/private/NavigationManager.php
@@ -274,7 +274,7 @@ class NavigationManager implements INavigationManager {
if (!isset($info['navigations']['navigation'])) {
continue;
}
- foreach ($info['navigations']['navigation'] as $nav) {
+ foreach ($info['navigations']['navigation'] as $key => $nav) {
if (!isset($nav['name'])) {
continue;
}
@@ -286,7 +286,7 @@ class NavigationManager implements INavigationManager {
continue;
}
$l = $this->l10nFac->get($app);
- $id = isset($nav['id']) ? $nav['id'] : $app;
+ $id = $nav['id'] ?? $app . ($key === 0 ? '' : $key);
$order = isset($nav['order']) ? $nav['order'] : 100;
$type = isset($nav['type']) ? $nav['type'] : 'link';
$route = $nav['route'] !== '' ? $this->urlGenerator->linkToRoute($nav['route']) : '';
--
GitLab