summaryrefslogtreecommitdiffstats
path: root/apps/theming
diff options
context:
space:
mode:
authorJulius Haertl <jus@bitgrid.net>2016-08-14 12:53:16 +0200
committerJulius Haertl <jus@bitgrid.net>2016-11-18 10:23:23 +0100
commitc7adcb85aefc384a59c6081015537a603a675c3e (patch)
tree0a70838d937acb18d39e50b977b56cd19b14b813 /apps/theming
parent64510bd87aaca44af3048121aff38d65c7712ae3 (diff)
downloadnextcloud-server-c7adcb85aefc384a59c6081015537a603a675c3e.tar.gz
nextcloud-server-c7adcb85aefc384a59c6081015537a603a675c3e.zip
Theming: Fix default parameters in icon routes
Signed-off-by: Julius Haertl <jus@bitgrid.net>
Diffstat (limited to 'apps/theming')
-rw-r--r--apps/theming/appinfo/routes.php1
-rw-r--r--apps/theming/lib/Controller/IconController.php4
2 files changed, 2 insertions, 3 deletions
diff --git a/apps/theming/appinfo/routes.php b/apps/theming/appinfo/routes.php
index a6511668d14..a8436ab254f 100644
--- a/apps/theming/appinfo/routes.php
+++ b/apps/theming/appinfo/routes.php
@@ -76,7 +76,6 @@ return ['routes' => [
'name' => 'Icon#getThemedIcon',
'url' => '/img/{app}/{image}',
'verb' => 'GET',
- 'defaults' => array("app" => "core"),
'requirements' => array('image' => '.+')
],
]];
diff --git a/apps/theming/lib/Controller/IconController.php b/apps/theming/lib/Controller/IconController.php
index 7ceaa599232..6e51f10c4cc 100644
--- a/apps/theming/lib/Controller/IconController.php
+++ b/apps/theming/lib/Controller/IconController.php
@@ -109,7 +109,7 @@ class IconController extends Controller {
* @param $app app name
* @return StreamResponse|DataResponse
*/
- public function getFavicon($app) {
+ public function getFavicon($app="core") {
// TODO: we need caching here
$icon = $this->renderAppIcon($app);
$icon->resizeImage(32, 32, Imagick::FILTER_LANCZOS, 1);
@@ -130,7 +130,7 @@ class IconController extends Controller {
* @param $app app name
* @return StreamResponse|DataResponse
*/
- public function getTouchIcon($app) {
+ public function getTouchIcon($app="core") {
// TODO: we need caching here
$icon = $this->renderAppIcon($app);
$icon->resizeImage(512, 512, Imagick::FILTER_LANCZOS, 1);