summaryrefslogtreecommitdiffstats
path: root/lib/private/legacy
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2016-08-11 01:41:18 +0200
committerArthur Schiwon <blizzz@arthur-schiwon.de>2016-08-11 01:41:18 +0200
commitf3b15a9ab97ce4498bafc731dc24350e98a7cb51 (patch)
tree138f9aa4ea52bcd7c098d8454c1bca1fd6e1dcba /lib/private/legacy
parent0fc34c99f4e1dbe26e5074102f48f75d70fe97d0 (diff)
downloadnextcloud-server-f3b15a9ab97ce4498bafc731dc24350e98a7cb51.tar.gz
nextcloud-server-f3b15a9ab97ce4498bafc731dc24350e98a7cb51.zip
fixes, improvements, and another app:
* setupSettings now also triggered on enable * fixes detection of present admin section or settings in the DB * add update routine in such cases * encryption app migrated
Diffstat (limited to 'lib/private/legacy')
-rw-r--r--lib/private/legacy/app.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index 802c4b908b4..4144f3f6cf5 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -345,6 +345,12 @@ class OC_App {
} else {
$appManager->enableApp($app);
}
+
+ $info = self::getAppInfo($app);
+ if(isset($info['settings']) && is_array($info['settings'])) {
+ self::loadApp($app, false);
+ \OC::$server->getSettingsManager()->setupSettings($info['settings']);
+ }
}
/**