summaryrefslogtreecommitdiffstats
path: root/settings/Controller
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-06-12 10:23:00 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-06-12 10:26:53 +0200
commit62667914a0fb679f2a300934867ca24fbe6d44b6 (patch)
treed5131af12a0cac40054619667a32e6c25fd52bfd /settings/Controller
parentcc78e17d5f50d734c3db71ff13589bd7ff4376bc (diff)
downloadnextcloud-server-62667914a0fb679f2a300934867ca24fbe6d44b6.tar.gz
nextcloud-server-62667914a0fb679f2a300934867ca24fbe6d44b6.zip
Copyright fix, changed vue settings output name and fixes template name
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'settings/Controller')
-rw-r--r--settings/Controller/AppSettingsController.php2
-rw-r--r--settings/Controller/UsersController.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/settings/Controller/AppSettingsController.php b/settings/Controller/AppSettingsController.php
index b103a17ca11..5930bc700d4 100644
--- a/settings/Controller/AppSettingsController.php
+++ b/settings/Controller/AppSettingsController.php
@@ -141,7 +141,7 @@ class AppSettingsController extends Controller {
$params['bundles'] = $this->getBundles();
$this->navigationManager->setActiveEntry('core_apps');
- $templateResponse = new TemplateResponse('settings', 'settings', ['serverData' => $params]);
+ $templateResponse = new TemplateResponse('settings', 'settings-vue', ['serverData' => $params]);
$policy = new ContentSecurityPolicy();
$policy->addAllowedImageDomain('https://usercontent.apps.nextcloud.com');
$templateResponse->setContentSecurityPolicy($policy);
diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php
index f19efefbb68..671f6dbb1ca 100644
--- a/settings/Controller/UsersController.php
+++ b/settings/Controller/UsersController.php
@@ -246,7 +246,7 @@ class UsersController extends Controller {
$serverData['defaultQuota'] = $defaultQuota;
$serverData['canChangePassword'] = $canChangePassword;
- return new TemplateResponse('settings', 'settings', ['serverData' => $serverData]);
+ return new TemplateResponse('settings', 'settings-vue', ['serverData' => $serverData]);
}
/**