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

Merge pull request #2563 from acs-ferreira/patch-1

Browse Source 
Create GDimage from data if JPEG fails - Fix #2561
This commit is contained in:
buddh4 2017-05-31 13:02:19 +02:00 committed by GitHub
commit 90896d827b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
protected/humhub/modules/file/libs/ImageConverter.php
View File

@ -355,7 +355,10 @@ class ImageConverter
$gdImage = imagecreatefromgif($fileName);
break;
case IMAGETYPE_JPEG:
$gdImage = imagecreatefromjpeg($fileName);
$gdImage = @imagecreatefromjpeg($fileName);
if (!$gdImage) {
$gdImage = imagecreatefromstring(file_get_contents($fileName));
}
break;
}
} catch (\Exception $ex) {