diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2021-11-11 16:44:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-11 16:44:31 +0100 |
| commit | 36f1714f1d311470c162d7fcba6b2bee7154ddbc (patch) | |
| tree | bfaf7e61b7039266dc4208440d3643bae546febb | |
| parent | 4e1e81f336936f8fbffaba9c6f16f46379cf028e (diff) | |
| parent | 32005be6b228378a46b6a40edf87d7def7aebdfc (diff) | |
| download | nextcloud-server-23.0.0rc1.tar.gz nextcloud-server-23.0.0rc1.zip | |
Merge pull request #29666 from nextcloud/backport/29664/stable23v23.0.0rc1
| -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); |