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

Merge pull request #2588 from nextcloud/theming-check-empty 

Check if image files for theming are empty
This commit is contained in:
Björn Schießle 2016-12-09 15:57:44 +01:00 committed by GitHub
parent de8908bf29 5fbadee95f
commit d10be51d40
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,6 +94,9 @@ class IconController extends Controller {
$iconFile = $this->imageManager->getCachedImage("icon-" . $app . '-' . str_replace("/","_",$image)); $iconFile = $this->imageManager->getCachedImage("icon-" . $app . '-' . str_replace("/","_",$image));
} catch (NotFoundException $exception) { } catch (NotFoundException $exception) {
$icon = $this->iconBuilder->colorSvg($app, $image); $icon = $this->iconBuilder->colorSvg($app, $image);
if ($icon === false || $icon === "") {
return new NotFoundResponse();
}
$iconFile = $this->imageManager->setCachedImage("icon-" . $app . '-' . str_replace("/","_",$image), $icon); $iconFile = $this->imageManager->setCachedImage("icon-" . $app . '-' . str_replace("/","_",$image), $icon);
} }
if ($iconFile !== false) { if ($iconFile !== false) {

2
apps/theming/lib/IconBuilder.php
View File

@ -177,7 +177,7 @@ class IconBuilder {
return false; return false;
} }
$svg = file_get_contents($imageFile); $svg = file_get_contents($imageFile);
if ($svg !== false) { if ($svg !== false && $svg !== "") {
$color = $this->util->elementColor($this->themingDefaults->getMailHeaderColor()); $color = $this->util->elementColor($this->themingDefaults->getMailHeaderColor());
$svg = $this->util->colorizeSvg($svg, $color); $svg = $this->util->colorizeSvg($svg, $color);
return $svg; return $svg;