aboutsummaryrefslogtreecommitdiffstats
path: root/include/photo/photo_driver.php
diff options
context:
space:
mode:
Diffstat (limited to 'include/photo/photo_driver.php')
-rw-r--r--include/photo/photo_driver.php7
1 files changed, 4 insertions, 3 deletions
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)) {