diff options
Diffstat (limited to 'include/photo/photo_driver.php')
| -rw-r--r-- | include/photo/photo_driver.php | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index bbcc110c8..11e4c8af3 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -593,15 +593,24 @@ function import_profile_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); - if($result['success']) + if($result['success']) { $img_str = $result['body']; + + $h = explode("\n",$result['header']); + if($h) { + foreach($h as $hl) { + if(stristr($hl,'content-type:')) { + if(! stristr($hl,'image/')) { + $photo_failure = true; + } + } + } + } + $type = guess_image_type($photo, $result['header']); + } } $img = photo_factory($img_str, $type); |