diff options
author | Joas Schilling <coding@schilljs.com> | 2021-11-11 15:56:42 +0300 |
---|---|---|
committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2021-11-11 16:39:22 +0300 |
commit | 32005be6b228378a46b6a40edf87d7def7aebdfc (patch) | |
tree | bfaf7e61b7039266dc4208440d3643bae546febb | |
parent | 4e1e81f336936f8fbffaba9c6f16f46379cf028e (diff) |
Fix updating with apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
-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 2c5820fdd8b..8f21e091650 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -418,7 +418,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); |