X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FImages.php;h=8a810510f0489916363b98e1d397e430b602a9e0;hb=fca93793480839660870e899bea88f3637859fff;hp=c1ac731b6cf9b6af18c8af606c62029ad45cbd50;hpb=803c1d71de9e6d13da9576660c9ab8b8bb2c19f3;p=friendica.git

diff --git a/src/Util/Images.php b/src/Util/Images.php
index c1ac731b6c..8a810510f0 100644
--- a/src/Util/Images.php
+++ b/src/Util/Images.php
@@ -75,25 +75,23 @@ class Images
 	/**
 	 * Fetch image mimetype from the image data or guessing from the file name
 	 *
-	 * @param string   $image_data Image data
-	 * @param string   $filename   File name (for guessing the type via the extension)
-	 * @param string[] $mimeTypes  possible mime types
+	 * @param string $image_data Image data
+	 * @param string $filename   File name (for guessing the type via the extension)
+	 * @param string $mime       default mime type
 	 *
 	 * @return string
 	 * @throws \Exception
 	 */
-	public static function getMimeTypeByData(string $image_data, string $filename = '', array $mimeTypes = [])
+	public static function getMimeTypeByData(string $image_data, string $filename = '', string $mime = '')
 	{
-		foreach ($mimeTypes as $mimeType) {
-			if (substr($mimeType, 0, 6) == 'image/') {
-				Logger::info('Using default mime type', ['filename' => $filename, 'mime' => $mimeTypes]);
-				return $mimeType;
-			}
+		if (substr($mime, 0, 6) == 'image/') {
+			Logger::info('Using default mime type', ['filename' => $filename, 'mime' => $mime]);
+			return $mime;
 		}
 
 		$image = @getimagesizefromstring($image_data);
 		if (!empty($image['mime'])) {
-			Logger::info('Mime type detected via data', ['filename' => $filename, 'default' => $mimeTypes, 'mime' => $image['mime']]);
+			Logger::info('Mime type detected via data', ['filename' => $filename, 'default' => $mime, 'mime' => $image['mime']]);
 			return $image['mime'];
 		}
 
@@ -195,7 +193,7 @@ class Images
 		}
 
 		if (empty($img_str)) {
-			$img_str = DI::httpRequest()->fetch($url, 4);
+			$img_str = DI::httpClient()->fetch($url, 4);
 		}
 
 		if (!$img_str) {