aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-07-17 12:53:45 +0200
committerGitHub <noreply@github.com>2018-07-17 12:53:45 +0200
commita155f804859d4afc579986be6472dfd80ade267d (patch)
tree123031de8298ea99346c9f905155d37766955af0 /lib
parentf78db1820138df0a097399f088057c1b0682ec98 (diff)
parentcdb42432c3a58efc24f59d9a4bb453288f346eab (diff)
downloadnextcloud-server-a155f804859d4afc579986be6472dfd80ade267d.tar.gz
nextcloud-server-a155f804859d4afc579986be6472dfd80ade267d.zip
Merge pull request #10230 from nextcloud/feature/shareoverview
Feature/shares overview
Diffstat (limited to 'lib')
-rw-r--r--lib/private/NavigationManager.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/NavigationManager.php b/lib/private/NavigationManager.php
index 1c764f9c1ff..1874cd0e4ff 100644
--- a/lib/private/NavigationManager.php
+++ b/lib/private/NavigationManager.php
@@ -100,7 +100,7 @@ class NavigationManager implements INavigationManager {
if(!isset($entry['type'])) {
$entry['type'] = 'link';
}
- $this->entries[] = $entry;
+ $this->entries[$entry['id']] = $entry;
}
/**
@@ -133,7 +133,7 @@ class NavigationManager implements INavigationManager {
* @return array
*/
private function proceedNavigation(array $list): array {
- usort($list, function($a, $b) {
+ uasort($list, function($a, $b) {
if (isset($a['order']) && isset($b['order'])) {
return ($a['order'] < $b['order']) ? -1 : 1;
} else if (isset($a['order']) || isset($b['order'])) {