aboutsummaryrefslogtreecommitdiffstats
path: root/core/Controller
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2016-11-10 16:36:58 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2017-01-06 09:42:13 +0100
commit6380d503af3252e0fea8d25e8bbe2f91d5aee1da (patch)
tree3d1e8e834d79ef2263713ed4595d0d538a11114f /core/Controller
parent35b13b856b5ed2ab2c91a171b7c07b9fe60de721 (diff)
downloadnextcloud-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/Controller')
-rw-r--r--core/Controller/CssController.php5
1 files changed, 3 insertions, 2 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();
}