summaryrefslogtreecommitdiffstats
path: root/lib/private/legacy
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2016-08-08 23:31:26 +0200
committerArthur Schiwon <blizzz@arthur-schiwon.de>2016-08-09 18:05:09 +0200
commitceeb44bd04f2606bea4c94107850157719127581 (patch)
tree7ecb64a3ca929a7b3a721cfed65c65bf0c61831d /lib/private/legacy
parentedeb41ccaff186b116852df4caf8df144db682c8 (diff)
downloadnextcloud-server-ceeb44bd04f2606bea4c94107850157719127581.tar.gz
nextcloud-server-ceeb44bd04f2606bea4c94107850157719127581.zip
Initial work on Apps page split:
* interfaces for the Admin settings (IAdmin) and section (ISection) * SettingsManager service * example setup with LDAP app
Diffstat (limited to 'lib/private/legacy')
-rw-r--r--lib/private/legacy/app.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index 5395d1daeee..39f2f1a0efe 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -471,7 +471,7 @@ class OC_App {
$settings[] = array(
"id" => "admin",
"order" => 1000,
- "href" => $urlGenerator->linkToRoute('settings_admin'),
+ "href" => $urlGenerator->linkToRoute('settings.AdminSettings.index'),
"name" => $l->t("Admin"),
"icon" => $urlGenerator->imagePath("settings", "admin.svg")
);
@@ -1199,6 +1199,9 @@ class OC_App {
include $appPath . '/appinfo/update.php';
}
self::setupBackgroundJobs($appData['background-jobs']);
+ if(isset($appData['settings']) && is_array($appData['settings'])) {
+ \OC::$server->getSettingsManager()->setupSettings($appData['settings']);
+ }
//set remote/public handlers
if (array_key_exists('ocsid', $appData)) {