Merge pull request #4683 from annando/update-self

[friendica.git] / src / Object / Image.php

diff --git a/src/Object/Image.php b/src/Object/Image.php
index 84c462205e28e82d10cbf6dc1285b1ba1c634967..9692b84715c1d0e47db33de116c2e72ddd248a02 100644 (file)
--- a/src/Object/Image.php
+++ b/src/Object/Image.php
@@ -771,10 +771,14 @@ class Image
        {
                $data = [];
 
+               if (empty($url)) {
+                       return $data;
+               }
+
                $data = Cache::get($url);
 
                if (is_null($data) || !$data || !is_array($data)) {
-                       $img_str = Network::fetchURL($url, true, $redirects, 4);
+                       $img_str = Network::fetchUrl($url, true, $redirects, 4);
                        $filesize = strlen($img_str);
 
                        if (function_exists("getimagesizefromstring")) {
@@ -937,7 +941,7 @@ class Image
                $width = $Image->getWidth();
                $height = $Image->getHeight();
 
-               $hash = photo_new_resource();
+               $hash = Photo::newResource();
 
                $smallest = 0;