diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-12 19:00:54 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-12 19:00:54 -0700 |
| commit | 018e7022817fd73e904021ecf46f2c5839da9a62 (patch) | |
| tree | 0bc817910756931bcaa0b773d30d31ee3c8fa6ed /include/network.php | |
| parent | 5386686a1e0e60623d6421cbd85a93814c74fb58 (diff) | |
| parent | 1e0e812440b8b87c39a88692e39eb0baca736b6e (diff) | |
| download | volse-hubzilla-018e7022817fd73e904021ecf46f2c5839da9a62.tar.gz volse-hubzilla-018e7022817fd73e904021ecf46f2c5839da9a62.tar.bz2 volse-hubzilla-018e7022817fd73e904021ecf46f2c5839da9a62.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/mitem.php
view/nl/strings.php
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 a0782692e..e0c8885fd 100644 --- a/include/network.php +++ b/include/network.php @@ -603,7 +603,7 @@ function scale_external_images($s, $include_link = true, $scale_replace = false) $scaled = str_replace($scale_replace[0], $scale_replace[1], $mtch[3]); else $scaled = $mtch[3]; - $i = z_fetch_url($scaled); + $i = z_fetch_url($scaled,true); $cache = get_config('system','itemcache'); @@ -613,7 +613,10 @@ function scale_external_images($s, $include_link = true, $scale_replace = false) } // guess mimetype from headers or filename + $type = guess_image_type($mtch[3],$i['header']); + if(strpos($type,'image') === false) + continue; if($i['success']) { $ph = photo_factory($i['body'], $type); |