summaryrefslogtreecommitdiffstats
path: root/lib/private/App/AppManager.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/private/App/AppManager.php')
-rw-r--r--lib/private/App/AppManager.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php
index 7063878429a..ae5aeab9831 100644
--- a/lib/private/App/AppManager.php
+++ b/lib/private/App/AppManager.php
@@ -400,7 +400,11 @@ class AppManager implements IAppManager {
}
if ($automaticDisabled) {
- $this->autoDisabledApps[] = $appId;
+ $previousSetting = $this->appConfig->getValue($appId, 'enabled', 'yes');
+ if ($previousSetting !== 'yes' && $previousSetting !== 'no') {
+ $previousSetting = json_decode($previousSetting, true);
+ }
+ $this->autoDisabledApps[$appId] = $previousSetting;
}
unset($this->installedAppsCache[$appId]);