IHTTPResult::getContentType is now a string again

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

diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index ee2bedd..1a81a25 100644 (file)
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -166,7 +166,7 @@ class ParseUrl
                }
 
                // If it isn't a HTML file then exit
-               if (!in_array('html', $curlResult->getContentType())) {
+               if (($curlResult->getContentType() != '') && !strstr(strtolower($curlResult->getContentType()), 'html')) {
                        return $siteinfo;
                }
 
@@ -198,10 +198,8 @@ class ParseUrl
                $charset = '';
                // Look for a charset, first in headers
                // Expected form: Content-Type: text/html; charset=ISO-8859-4
-               foreach ($curlResult->getContentType() as $type) {
-                       if (preg_match('/charset=([a-z0-9-_.\/]+)/i', $type, $matches)) {
-                               $charset = trim(trim(trim(array_pop($matches)), ';,'));
-                       }
+               if (preg_match('/charset=([a-z0-9-_.\/]+)/i', $curlResult->getContentType(), $matches)) {
+                       $charset = trim(trim(trim(array_pop($matches)), ';,'));
                }
 
                // Then in body that gets precedence