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/network.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/network.php')
| -rw-r--r-- | include/network.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/network.php b/include/network.php index eeb2460d1..446413cd8 100644 --- a/include/network.php +++ b/include/network.php @@ -807,8 +807,11 @@ function scale_external_images($s,$include_link = true) { if(stristr($mtch[1],$hostname)) continue; $i = fetch_url($mtch[1]); + // guess mimetype from headers or filename + $type = guess_image_type($mtch[1],true); + if($i) { - $ph = new Photo($i); + $ph = new Photo($i, $type); if($ph->is_valid()) { $orig_width = $ph->getWidth(); $orig_height = $ph->getHeight(); |