diff options
Diffstat (limited to 'include/photo/photo_driver.php')
| -rw-r--r-- | include/photo/photo_driver.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index 32b9bd302..d439e9877 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -542,6 +542,7 @@ function guess_image_type($filename, $headers = '') { } } +/* if(is_null($type)) { $ext = pathinfo($filename, PATHINFO_EXTENSION); $ph = photo_factory(''); @@ -551,6 +552,13 @@ function guess_image_type($filename, $headers = '') { 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); return $type; |