Merge pull request #29668 from nextcloud/backport/29664/stable21

[stable21] Fix updating with apps

Author: blizzz

lib/private/App/AppManager.php

@@ -204,7 +204,7 @@ public function getAppRestriction(string $appId): array {
 		if ($values[$appId] === 'yes' || $values[$appId] === 'no') {
 			return [];
 		}
-		return json_decode($values[$appId]);
+		return json_decode($values[$appId], true);
 	}
 
 

lib/private/Updater.php

@@ -427,7 +427,7 @@ private function upgradeAppStoreApps(array $apps, array $previousEnableStates =
 
 				if (!empty($previousEnableStates)) {
 					$ocApp = new \OC_App();
-					if (!empty($previousEnableStates[$app])) {
+					if (!empty($previousEnableStates[$app]) && is_array($previousEnableStates[$app])) {
 						$ocApp->enable($app, $previousEnableStates[$app]);
 					} else {
 						$ocApp->enable($app);