diff options
author | blizzz <blizzz@arthur-schiwon.de> | 2021-11-11 17:48:49 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-11 17:48:49 +0300 |
commit | 5cb7d247e2f9404a40873daf29e553bd43b09957 (patch) | |
tree | e9bca476d6bbd24b19c7932d24f7e61f6cb818b6 | |
parent | 7bee566e602fa474db142fbac01d33dc1dc9fe54 (diff) | |
parent | fd30500a92e9d7681e9211157b4917441986d4ba (diff) |
Merge pull request #29668 from nextcloud/backport/29664/stable21
[stable21] 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 ae5aeab9831..62e66669991 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 9c9da1f50c0..a8711944341 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -427,7 +427,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); |