upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 00:32:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #42088 from nextcloud/backport/42055/stable28

Browse source 
[stable28] enh(NavigationManager): Use ID as fallback for `app` property of entries
This commit is contained in:
Andy Scherzinger 2023-12-07 12:41:52 +01:00 committed by GitHub
commit d147641484
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/private/NavigationManager.php
View file

@ -95,7 +95,10 @@ class NavigationManager implements INavigationManager {
return;
}
$id = $entry['id'];
$entry['active'] = false;
$entry['unread'] = $this->unreadCounters[$id] ?? 0;
if (!isset($entry['icon'])) {
$entry['icon'] = '';
}
@ -106,9 +109,12 @@ class NavigationManager implements INavigationManager {
$entry['type'] = 'link';
}
$id = $entry['id'];
$entry['unread'] = $this->unreadCounters[$id] ?? 0;
if ($entry['type'] === 'link') {
// app might not be set when using closures, in this case try to fallback to ID
if (!isset($entry['app']) && $this->appManager->isEnabledForUser($id)) {
$entry['app'] = $id;
}
// This is the default app that will always be shown first
$entry['default'] = ($entry['app'] ?? false) === $this->defaultApp;
// Set order from user defined app order