fix(AppManager): Ensure that app manager can handle empty app keys on the navigation entries

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

1 files changed, 6 insertions, 4 deletions

diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php
index a7ab22dfc66..84bc297143a 100644
--- a/lib/private/App/AppManager.php
+++ b/lib/private/App/AppManager.php
@@ -838,10 +838,12 @@ class AppManager implements IAppManager {
 				/* Fallback on user defined apporder */
 				$customOrders = json_decode($this->config->getUserValue($user->getUID(), 'core', 'apporder', '[]'), true, flags:JSON_THROW_ON_ERROR);
 				if (!empty($customOrders)) {
-					uasort($customOrders, function ($a, $b) {
-						return $a['order'] - $b['order'];
-					});
-					$defaultApps = array_keys($customOrders);
+					// filter only entries with app key (when added using closures or NavigationManager::add the app is not guranteed to be set)
+					$customOrders = array_filter($customOrders, fn ($entry) => isset($entry['app']));
+					// sort apps by order
+					usort($customOrders, fn ($a, $b) => $a['order'] - $b['order']);
+					// set default apps to sorted apps
+					$defaultApps = array_map(fn ($entry) => $entry['app'], $customOrders);
 				}
 			}
 		}