diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-05-23 19:50:42 +0200 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2018-06-06 11:40:09 +0200 |
| commit | eccc391bdac3d900bb95ba3d5304ad9e61af629b (patch) | |
| tree | 95e8526894e4672f0411939a5ecab0eb97c77b6d /settings/Controller | |
| parent | a8a655b1c0a393f873bff89e55d8a26697aa9a59 (diff) | |
| download | nextcloud-server-eccc391bdac3d900bb95ba3d5304ad9e61af629b.tar.gz nextcloud-server-eccc391bdac3d900bb95ba3d5304ad9e61af629b.zip | |
Load marked and return proper Template with CSP
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'settings/Controller')
| -rw-r--r-- | settings/Controller/AppSettingsController.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/settings/Controller/AppSettingsController.php b/settings/Controller/AppSettingsController.php index 98835dc583e..8e72b5ab2db 100644 --- a/settings/Controller/AppSettingsController.php +++ b/settings/Controller/AppSettingsController.php @@ -139,6 +139,7 @@ class AppSettingsController extends Controller { $category = 'installed'; } + \OC_Util::addVendorScript('core', 'marked/marked.min'); $params = []; $params['category'] = $category; $params['appstoreEnabled'] = $this->config->getSystemValue('appstoreenabled', true) === true; @@ -146,12 +147,11 @@ class AppSettingsController extends Controller { $params['updateCount'] = count($this->getAppsWithUpdates()); $this->navigationManager->setActiveEntry('core_apps'); - $templateResponse = new TemplateResponse($this->appName, 'apps', $params, 'user'); + $templateResponse = new TemplateResponse('settings', 'settings', ['serverData' => $params]); $policy = new ContentSecurityPolicy(); $policy->addAllowedImageDomain('https://usercontent.apps.nextcloud.com'); $templateResponse->setContentSecurityPolicy($policy); - return new TemplateResponse('settings', 'settings', ['serverData' => $params]); return $templateResponse; } |