From dcea4da994425ce41d037b90f28272a86425430a Mon Sep 17 00:00:00 2001
From: Mirek Bauer <bauer@cesnet.cz>
Date: Mon, 5 Dec 2016 14:57:17 +0100
Subject: [PATCH] Backported #26748 fix to stable9

---
 settings/controller/appsettingscontroller.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/settings/controller/appsettingscontroller.php b/settings/controller/appsettingscontroller.php
index cc69d3130d98..7f2b682ecfb1 100644
--- a/settings/controller/appsettingscontroller.php
+++ b/settings/controller/appsettingscontroller.php
@@ -282,6 +282,8 @@ public function listApps($category = '', $includeUpdateInfo = true) {
 			$groups = array();
 			if (is_string($app['groups'])) {
 				$groups = json_decode($app['groups']);
+			} elseif (is_array($app['groups'])) {
+				$groups = $app['groups'];
 			}
 			$app['groups'] = $groups;
 			$app['canUnInstall'] = !$app['active'] && $app['removable'];