diff options
| author | friendica <info@friendica.com> | 2012-06-07 15:48:04 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-06-07 15:48:04 -0700 |
| commit | 67d8afb9d18df137fddc991443f9b796b5821210 (patch) | |
| tree | c9f505934f64e6bfa30a9cab64f6732c8ea9537d /include/items.php | |
| parent | c4aeb57fcda6253fd9ca91b5177a17b97e3c9b70 (diff) | |
| parent | f4a80fcf2474a13b2d733f59f1a928b40841d83c (diff) | |
| download | volse-hubzilla-67d8afb9d18df137fddc991443f9b796b5821210.tar.gz volse-hubzilla-67d8afb9d18df137fddc991443f9b796b5821210.tar.bz2 volse-hubzilla-67d8afb9d18df137fddc991443f9b796b5821210.zip | |
Merge https://github.com/friendica/friendica into pull
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']) ); |