diff options
Diffstat (limited to 'include/photo')
| -rw-r--r-- | include/photo/photo_driver.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index d439e9877..810e0cdc7 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -542,23 +542,22 @@ function guess_image_type($filename, $headers = '') { } } -/* if(is_null($type)) { $ext = pathinfo($filename, PATHINFO_EXTENSION); $ph = photo_factory(''); $types = $ph->supportedTypes(); - $type = "image/jpeg"; foreach ($types as $m=>$e){ 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; |