upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-13 10:40:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #29666 from nextcloud/backport/29664/stable23

Browse source
This commit is contained in:
John Molakvoæ 2021-11-11 16:44:31 +01:00 committed by GitHub
commit 36f1714f1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/private/App/AppManager.php
View file

@ -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);
}

2
lib/private/Updater.php
View file

@ -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);