harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

possibly better fix for profile photo image type issue

Browse Source
This commit is contained in:
Mario Vavti 2015-10-29 11:30:45 +01:00
parent e0a75f68d5
commit 98fd919647
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/photo/photo_driver.php
View File

@ -593,15 +593,24 @@ function import_profile_photo($photo,$xchan,$thing = false) {
if($photo) { if($photo) {
$filename = basename($photo); $filename = basename($photo);
$type = guess_image_type($photo);
if(! $type)
$type = 'image/jpeg';
$result = z_fetch_url($photo,true); $result = z_fetch_url($photo,true);
if($result['success']) if($result['success']) {
$img_str = $result['body']; $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); $img = photo_factory($img_str, $type);