summaryrefslogtreecommitdiffstats
path: root/lib/private/App
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2021-10-01 16:40:25 +0200
committerJoas Schilling <coding@schilljs.com>2021-10-13 09:34:55 +0200
commit0b747538ff2849b3e27a8fcf3b68c5b8007b28d9 (patch)
treeee9a1763f33ac1042627c745e77f034e3da59ba9 /lib/private/App
parent1ea5983568dc99aa80e52f18837629d137b8a03c (diff)
downloadnextcloud-server-0b747538ff2849b3e27a8fcf3b68c5b8007b28d9.tar.gz
nextcloud-server-0b747538ff2849b3e27a8fcf3b68c5b8007b28d9.zip
Keep group restrictions when reenabling apps after an update
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/private/App')
-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 388a743b936..b1f3097cc3d 100644
--- a/lib/private/App/AppManager.php
+++ b/lib/private/App/AppManager.php
@@ -391,7 +391,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]);