diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2021-11-11 18:07:24 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-11 18:07:24 +0300 |
| commit | bb04b67c397261ddf814d98220a6a61a98cf4bb8 (patch) | |
| tree | 14754ea8529cf2f94d7d8fefb43bbbfe4d3ec59d | |
| parent | f77bd4360ce14673865b15035ee1d82ec8243f15 (diff) | |
| parent | b89e548879d41f5d46d6fe14865dd2f461690598 (diff) | |
Merge pull request #29669 from nextcloud/backport/29664/stable20
[stable20] 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 2721725bf94..3316bb9cd12 100644 --- 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); } diff --git a/lib/private/Updater.php b/lib/private/Updater.php index c8f78c4a937..8885d4dcff7 100644 --- 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); |