diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2012-06-07 17:42:13 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2012-06-07 17:42:13 +0200 |
| commit | 7cc8c369cb6a01cffb58215966844b53794f32f4 (patch) | |
| tree | 758fc647c3e5d6dc36ec62e8e34c4471b388f97d /include/items.php | |
| parent | 1d832618a4340526092fce9e49f4580f767e1526 (diff) | |
| download | volse-hubzilla-7cc8c369cb6a01cffb58215966844b53794f32f4.tar.gz volse-hubzilla-7cc8c369cb6a01cffb58215966844b53794f32f4.tar.bz2 volse-hubzilla-7cc8c369cb6a01cffb58215966844b53794f32f4.zip | |
Add support for PNG images with alpha
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/items.php b/include/items.php index 66e219ddf..15c043e92 100755 --- a/include/items.php +++ b/include/items.php @@ -1346,7 +1346,11 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) } $img_str = fetch_url($photo_url,true); - $img = new Photo($img_str); + // guess mimetype from headers or filename + $type = guess_image_type($photo_url,true); + + + $img = new Photo($img_str, $type); if($img->is_valid()) { if($have_photo) { q("DELETE FROM `photo` WHERE `resource-id` = '%s' AND `contact-id` = %d AND `uid` = %d", @@ -1372,9 +1376,9 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) q("UPDATE `contact` SET `avatar-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1", dbesc(datetime_convert()), - dbesc($a->get_baseurl() . '/photo/' . $hash . '-4.jpg'), - dbesc($a->get_baseurl() . '/photo/' . $hash . '-5.jpg'), - dbesc($a->get_baseurl() . '/photo/' . $hash . '-6.jpg'), + dbesc($a->get_baseurl() . '/photo/' . $hash . '-4.'.$img->getExt()), + dbesc($a->get_baseurl() . '/photo/' . $hash . '-5.'.$img->getExt()), + dbesc($a->get_baseurl() . '/photo/' . $hash . '-6.'.$img->getExt()), intval($contact['uid']), intval($contact['id']) ); |