From 08c9152abdfa90da09931bdcc6e6c81ea243434c Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 1 Feb 2021 22:58:55 +0000 Subject: fix getting mimetype via getimagesize() and do not default to image/jpeg yet if it could not be found --- include/photo/photo_driver.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'include/photo/photo_driver.php') diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index 97871e139..87b1d96fe 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -69,7 +69,7 @@ function photo_factory($data, $type = null) { * @return null|string Guessed mimetype */ function guess_image_type($filename, $data = '') { - + if($data) $headers = (is_array($data) ? $data['header'] : $data); @@ -135,9 +135,10 @@ function guess_image_type($filename, $data = '') { } } - if(is_null($type) && strpos($filename, 'http') === false) { + if(is_null($type) && strpos($filename, 'http') === 0) { $size = getimagesize($filename); - $type = ((array_key_exists($size['mime'], $types)) ? $size['mime'] : 'image/jpeg'); + if (array_key_exists($size['mime'], $types)) + $type = $size['mime']; } if(is_null($type)) { -- cgit v1.2.3