summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2016-08-11 00:45:15 +0200
committerArthur Schiwon <blizzz@arthur-schiwon.de>2016-08-11 00:45:15 +0200
commit0fc34c99f4e1dbe26e5074102f48f75d70fe97d0 (patch)
treef4ce1b531b7e7fe5bd40f8bb4a3f574e3485220e /lib
parent1eb8b951c2eb6388efdd628c878110d78ae4e77d (diff)
downloadnextcloud-server-0fc34c99f4e1dbe26e5074102f48f75d70fe97d0.tar.gz
nextcloud-server-0fc34c99f4e1dbe26e5074102f48f75d70fe97d0.zip
fix registration of admin settings and section on app install
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Installer.php1
-rw-r--r--lib/private/legacy/app.php6
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/private/Installer.php b/lib/private/Installer.php
index a4300785002..eed97e18d94 100644
--- a/lib/private/Installer.php
+++ b/lib/private/Installer.php
@@ -135,7 +135,6 @@ class Installer {
}
\OC_App::setupBackgroundJobs($info['background-jobs']);
- \OC::$server->getSettingsManager()->setupSettings($info['settings']);
//run appinfo/install.php
if((!isset($data['noinstall']) or $data['noinstall']==false)) {
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index bba4f59555e..802c4b908b4 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -1162,6 +1162,12 @@ class OC_App {
if (isset($appData['id'])) {
$config->setAppValue($app, 'ocsid', $appData['id']);
}
+
+ if(isset($info['settings']) && is_array($info['settings'])) {
+ self::loadApp($app, false);
+ \OC::$server->getSettingsManager()->setupSettings($info['settings']);
+ }
+
\OC_Hook::emit('OC_App', 'post_enable', array('app' => $app));
} else {
if(empty($appName) ) {