mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Theming: Fix default parameters in icon routes 

Signed-off-by: Julius Haertl <jus@bitgrid.net>
This commit is contained in:
Julius Haertl 2016-08-14 12:53:16 +02:00
parent 64510bd87a
commit c7adcb85ae
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/theming/appinfo/routes.php
View File

@ -76,7 +76,6 @@ return ['routes' => [
'name' => 'Icon#getThemedIcon',
'url' => '/img/{app}/{image}',
'verb' => 'GET',
'defaults' => array("app" => "core"),
'requirements' => array('image' => '.+')
],
]];

4
apps/theming/lib/Controller/IconController.php
View File

@ -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);

2
lib/private/URLGenerator.php
View File

@ -158,8 +158,10 @@ class URLGenerator implements IURLGenerator {
// Check if the app is in the app folder
$path = '';
if(\OCP\App::isEnabled('theming') && $image === "favicon.ico") {
if($app==="") { $app = "core"; }
$path = $this->linkToRoute('theming.Icon.getFavicon', [ 'app' => $app ]);
} elseif(\OCP\App::isEnabled('theming') && $image === "favicon-touch.png") {
if($app==="") { $app = "core"; }
$path = $this->linkToRoute('theming.Icon.getTouchIcon', [ 'app' => $app ]);
} elseif (file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$image")) {
$path = \OC::$WEBROOT . "/themes/$theme/apps/$app/img/$image";