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 /mod/parse_url.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 'mod/parse_url.php')
-rw-r--r-- | mod/parse_url.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mod/parse_url.php b/mod/parse_url.php index 27dac4d5d..cdf2223a8 100644 --- a/mod/parse_url.php +++ b/mod/parse_url.php @@ -215,8 +215,11 @@ function parse_url_content(&$a) { $i = fetch_url($image); if($i) { + // guess mimetype from headers or filename + $type = guess_image_type($image,true); + require_once('include/Photo.php'); - $ph = new Photo($i); + $ph = new Photo($i, $type); if($ph->is_valid()) { if($ph->getWidth() > 300 || $ph->getHeight() > 300) { $ph->scaleImage(300); |