mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 14:18:27 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4610 from humhub/fix/4609

Browse Source 
Fix #4609: Error on downscale command
This commit is contained in:
Lucas Bartholemy 2020-11-09 10:48:37 +01:00 committed by GitHub
commit ca6e4fd4e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -12,6 +12,7 @@ HumHub Changelog
------------------------ ------------------------
- Fix #4590: Page loader color contrast too low - Fix #4590: Page loader color contrast too low
- Fix #4599: File preview not visible if initialized in background - Fix #4599: File preview not visible if initialized in background
- Fix #4609: Error on downscale command
1.7.0-beta.2 (October 26, 2020) 1.7.0-beta.2 (October 26, 2020)

8
protected/humhub/modules/file/libs/ImageHelper.php
View File

@ -105,7 +105,13 @@ class ImageHelper
return; return;
} }
$image = Image::getImagine()->open($file->store->get()); try {
$image = Image::getImagine()->open($file->store->get());
} catch (\Exception $ex) {
Yii::error('Could not open image ' . $file->store->get() . '. Error: ' . $ex->getMessage(), 'file');
return;
}
static::fixJpegOrientation($image, $file); static::fixJpegOrientation($image, $file);
if ($module->imageMaxResolution !== null) { if ($module->imageMaxResolution !== null) {