Merge pull request #351 from annando/master

[friendica.git] / include / network.php

diff --git a/include/network.php b/include/network.php
index eeb2460d140a248d1faba41f414126ca84f36125..446413cd834c5cd81ebd4e02ca6d8861c9f2e6fc 100644 (file)
--- 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();