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