Issue 6477: Use the correct content-type to resize the images

[friendica.git] / src / Model / Photo.php

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 2d740e137858c9e4d47059eb8d75818d3be032ad..68665126fb44c21aa26420ff3147bf87219e5d2b 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -414,7 +414,9 @@ class Photo extends BaseObject
 
                $filename = basename($image_url);
                if (!empty($image_url)) {
-                       $img_str = Network::fetchUrl($image_url, true);
+                       $ret = Network::curl($image_url, true);
+                       $img_str = $ret->getBody();
+                       $type = $ret->getContentType();
                } else {
                        $img_str = '';
                }
@@ -423,7 +425,10 @@ class Photo extends BaseObject
                        return false;
                }
 
-               $type = Image::guessType($image_url, true);
+               if (empty($type)) {
+                       $type = Image::guessType($image_url, true);
+               }
+
                $Image = new Image($img_str, $type);
                if ($Image->isValid()) {
                        $Image->scaleToSquare(300);