Fix apporder when an application has several menu items

Signed-off-by: Côme Chilliet <[email protected]>
nextcloud · Nov 9, 2023 · 30fb835 · 30fb835
1 parent 5208282
commit 30fb835
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/apps/theming/lib/Listener/BeforePreferenceListener.php b/apps/theming/lib/Listener/BeforePreferenceListener.php
@@ -46,8 +46,10 @@ public function handle(Event $event): void {
 		}
 
 		switch ($event->getAppId()) {
-			case Application::APP_ID: $this->handleThemingValues($event); break;
-			case 'core': $this->handleCoreValues($event); break;
+			case Application::APP_ID: $this->handleThemingValues($event);
+				break;
+			case 'core': $this->handleCoreValues($event);
+				break;
 		}
 	}
 
@@ -78,8 +80,8 @@ private function handleCoreValues(BeforePreferenceSetEvent|BeforePreferenceDelet
 
 		$value = json_decode($event->getConfigValue(), true, flags:JSON_THROW_ON_ERROR);
 		if (is_array(($value))) {
-			foreach ($value as $appName => $order) {
-				if (!$this->appManager->isEnabledForUser($appName) || !is_array($order) || empty($order) || !is_numeric($order[key($order)])) {
+			foreach ($value as $id => $info) {
+				if (!is_array($info) || empty($info) || !isset($info['app']) || !$this->appManager->isEnabledForUser($info['app']) || !is_numeric($info['order'] ?? '')) {
 					// Invalid config value, refuse the change
 					return;
 				}