kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 20:26:42 +00:00
Code Issues Projects Releases Wiki Activity

Hotfix (will be included in v2.5.0 release): Don't break image loading when php-gd extension is not installed

Browse Source
This commit is contained in:
Bernd Bestel
2019-09-22 14:48:50 +02:00
parent e5aebad5d9
commit 66571f662f
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
changelog/52_2.5.0_2019-09-22.md
View File

@@ -75,7 +75,7 @@
- Fixed that date/time pickers not considered the `config.php` setting `CALENDAR_FIRST_DAY_OF_WEEK` - Fixed that date/time pickers not considered the `config.php` setting `CALENDAR_FIRST_DAY_OF_WEEK`
- Improved the handling which entry page to use with disabled feature flags (thanks @nielstholenaar) - Improved the handling which entry page to use with disabled feature flags (thanks @nielstholenaar)
- Boolean settings provided via environment variables (so the strings `true` and `false`) are now parsed correctly (thanks @mduret) - Boolean settings provided via environment variables (so the strings `true` and `false`) are now parsed correctly (thanks @mduret)
- All uploaded pictures (currently for products and recipes) are now automatically downscaled to the appropriate size when serving them to improve page load times - All uploaded pictures (currently for products and recipes) are now automatically downscaled to the appropriate size when serving them to improve page load times (this requires the `php-gd` extension, if not installed, images will not be downscaled)
- It's now possible to test plural forms of quantity units (button on the quantity unit edit page, only visible if the current language requires more than 2 plural forms) - It's now possible to test plural forms of quantity units (button on the quantity unit edit page, only visible if the current language requires more than 2 plural forms)
- On the login page no menus and the sidebar is now hidden - On the login page no menus and the sidebar is now hidden
- New translations: (thanks all the translators) - New translations: (thanks all the translators)

5
services/FilesService.php
View File

@@ -42,6 +42,11 @@ class FilesService extends BaseService
$fileNameDownscaled = $fileNameWithoutExtension . '__downscaledto' . ($bestFitHeight ? $bestFitHeight : 'auto') . 'x' . ($bestFitWidth ? $bestFitWidth : 'auto') . '.' . $fileExtension; $fileNameDownscaled = $fileNameWithoutExtension . '__downscaledto' . ($bestFitHeight ? $bestFitHeight : 'auto') . 'x' . ($bestFitWidth ? $bestFitWidth : 'auto') . '.' . $fileExtension;
$filePathDownscaled = $this->GetFilePath($group, $fileNameDownscaled); $filePathDownscaled = $this->GetFilePath($group, $fileNameDownscaled);
if (!extension_loaded('gd'))
{
return $filePath;
}
try try
{ {
if (!file_exists($filePathDownscaled)) if (!file_exists($filePathDownscaled))