diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2021-11-11 15:35:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-11 15:35:57 +0100 |
| commit | 9b35c8f41cc5df840ecbe28139791a29d55dee53 (patch) | |
| tree | 19a51c96558759c3d30c21a11aec121b49d763c9 | |
| parent | e7dcfdaa48d76b14143cddd02c211046b26d3c68 (diff) | |
| parent | ef48e7045e6bccd65c8cf377dcbd7b16e1337241 (diff) | |
| download | nextcloud-server-9b35c8f41cc5df840ecbe28139791a29d55dee53.tar.gz nextcloud-server-9b35c8f41cc5df840ecbe28139791a29d55dee53.zip | |
Merge pull request #29667 from nextcloud/backport/29664/stable22
[stable22] Fix updating with apps
| -rw-r--r-- | lib/private/App/AppManager.php | 2 | ||||
| -rw-r--r-- | lib/private/Updater.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php index b1f3097cc3d..f154bd854ad 100644 --- a/lib/private/App/AppManager.php +++ b/lib/private/App/AppManager.php @@ -195,7 +195,7 @@ class AppManager implements IAppManager { if ($values[$appId] === 'yes' || $values[$appId] === 'no') { return []; } - return json_decode($values[$appId]); + return json_decode($values[$appId], true); } diff --git a/lib/private/Updater.php b/lib/private/Updater.php index 7d98abd934a..9b7a53a6e62 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -432,7 +432,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); |