Merge pull request #29669 from nextcloud/backport/29664/stable20

[stable20] Fix updating with apps
3 years ago · bb04b67c39
parent f77bd4360c b89e548879
commit bb04b67c39
2 changed files with 2 additions and 2 deletions
--- a/lib/private/App/AppManager.php
+++ b/lib/private/App/AppManager.php
@ -204,7 +204,7 @@ class AppManager implements IAppManager {
 		if ($values[$appId] === 'yes' || $values[$appId] === 'no') {
 			return [];
 		}
-		return json_decode($values[$appId]);
+		return json_decode($values[$appId], true);
 	}


--- a/lib/private/Updater.php
+++ b/lib/private/Updater.php
@ -466,7 +466,7 @@ class Updater extends BasicEmitter {

 				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);