harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pathinfo() does not work in this case. getimagesize() seems more reliabel. this fixes transparent png avatars having a black background.

Browse Source
This commit is contained in:
Mario Vavti 2015-10-28 20:01:50 +01:00
parent 612efe56f1
commit 1375ed6aea
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/photo/photo_driver.php
View File

@ -542,6 +542,7 @@ function guess_image_type($filename, $headers = '') {
} }
} }
/*
if(is_null($type)) { if(is_null($type)) {
$ext = pathinfo($filename, PATHINFO_EXTENSION); $ext = pathinfo($filename, PATHINFO_EXTENSION);
$ph = photo_factory(''); $ph = photo_factory('');
@ -551,6 +552,13 @@ function guess_image_type($filename, $headers = '') {
if ($ext==$e) $type = $m; if ($ext==$e) $type = $m;
} }
} }
*/
if(is_null($type)) {
$size = getimagesize($filename);
$ph = photo_factory('');
$types = $ph->supportedTypes();
$type = ((array_key_exists($size['mime'], $types)) ? $size['mime'] : 'image/jpeg');
}
} }
logger('Photo: guess_image_type: type='.$type, LOGGER_DEBUG); logger('Photo: guess_image_type: type='.$type, LOGGER_DEBUG);
return $type; return $type;