diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2016-11-10 16:36:58 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2017-01-06 09:42:13 +0100 |
| commit | 6380d503af3252e0fea8d25e8bbe2f91d5aee1da (patch) | |
| tree | 3d1e8e834d79ef2263713ed4595d0d538a11114f /core | |
| parent | 35b13b856b5ed2ab2c91a171b7c07b9fe60de721 (diff) | |
| download | nextcloud-server-6380d503af3252e0fea8d25e8bbe2f91d5aee1da.tar.gz nextcloud-server-6380d503af3252e0fea8d25e8bbe2f91d5aee1da.zip | |
Css cache folder name fix, route fix and various fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'core')
| -rw-r--r-- | core/Controller/CssController.php | 5 | ||||
| -rw-r--r-- | core/routes.php | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/Controller/CssController.php b/core/Controller/CssController.php index 31ec801d21c..323dd21496b 100644 --- a/core/Controller/CssController.php +++ b/core/Controller/CssController.php @@ -58,11 +58,12 @@ class CssController extends Controller { * @NoCSRFRequired * * @param string $fileName css filename with extension + * @param string $appName css folder name * @return text/css */ - public function getCss($fileName) { + public function getCss($fileName, $appName) { try { - $cssFile = $this->cssManager->getCss($fileName); + $cssFile = $this->cssManager->getCss($fileName, $appName); } catch(NotFoundException $e) { return new NotFoundResponse(); } diff --git a/core/routes.php b/core/routes.php index dec979c8ce2..6f1892d19ac 100644 --- a/core/routes.php +++ b/core/routes.php @@ -55,7 +55,7 @@ $application->registerRoutes($this, [ ['name' => 'OCJS#getConfig', 'url' => '/core/js/oc.js', 'verb' => 'GET'], ['name' => 'Preview#getPreview', 'url' => '/core/preview', 'verb' => 'GET'], ['name' => 'Preview#getPreview', 'url' => '/core/preview.png', 'verb' => 'GET'], - ['name' => 'Css#getCss', 'url' => '/css/{fileName}', 'verb' => 'GET'], + ['name' => 'Css#getCss', 'url' => '/css/{appName}/{fileName}', 'verb' => 'GET'], ], 'ocs' => [ ['root' => '/cloud', 'name' => 'OCS#getCapabilities', 'url' => '/capabilities', 'verb' => 'GET'], |