Merge pull request #11503 from annando/bulk-delivery

[friendica.git] / src / Util / Images.php

diff --git a/src/Util/Images.php b/src/Util/Images.php
index 077509d3cb5e6e1c64105e2a7886bd131cf31be5..c268916cc9b1e25f65e72d215b013c1377111fa3 100644 (file)
--- a/src/Util/Images.php
+++ b/src/Util/Images.php
@@ -24,6 +24,7 @@ namespace Friendica\Util;
 use Friendica\Core\Logger;
 use Friendica\DI;
 use Friendica\Model\Photo;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 
 /**
  * Image utilities
@@ -184,12 +185,14 @@ class Images
                        return $data;
                }
 
-               $data = DI::cache()->get($url);
+               $cacheKey = 'getInfoFromURL:' . sha1($url);
+
+               $data = DI::cache()->get($cacheKey);
 
                if (empty($data) || !is_array($data)) {
                        $data = self::getInfoFromURL($url);
 
-                       DI::cache()->set($url, $data);
+                       DI::cache()->set($cacheKey, $data);
                }
 
                return $data;
@@ -217,7 +220,7 @@ class Images
                }
 
                if (empty($img_str)) {
-                       $img_str = DI::httpClient()->fetch($url, 4);
+                       $img_str = DI::httpClient()->fetch($url, HttpClientAccept::IMAGE, 4);
                }
 
                if (!$img_str) {