aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-10-29 11:29:11 +0100
committerMario Vavti <mario@mariovavti.com>2015-10-29 11:29:11 +0100
commit0a9b2b6b15bcf3f3b2fe604defd0cd99934f992b (patch)
tree8b04bb6a20e769cdd598fb591283bf4ab7dfc710
parentbb469deb850dacc16e26ceb65f2a215a72eb6caa (diff)
downloadvolse-hubzilla-0a9b2b6b15bcf3f3b2fe604defd0cd99934f992b.tar.gz
volse-hubzilla-0a9b2b6b15bcf3f3b2fe604defd0cd99934f992b.tar.bz2
volse-hubzilla-0a9b2b6b15bcf3f3b2fe604defd0cd99934f992b.zip
possibly better fox for profil photo image type issue
-rw-r--r--include/photo/photo_driver.php6
1 files changed, 1 insertions, 5 deletions
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index 810e0cdc7..f9b6e5ea8 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -593,11 +593,6 @@ function import_xchan_photo($photo,$xchan,$thing = false) {
if($photo) {
$filename = basename($photo);
- $type = guess_image_type($photo);
-
- if(! $type)
- $type = 'image/jpeg';
-
$result = z_fetch_url($photo,true);
@@ -614,6 +609,7 @@ function import_xchan_photo($photo,$xchan,$thing = false) {
}
}
}
+ $type = guess_image_type($photo, $result['header']);
}
}
else {