X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FParseUrl.php;h=33828848391410a843475080905a30d41af1eaa7;hb=e02c475c9e98f27f631bd245592f1641c181db72;hp=0a12e628298b9398924d56f37347237958a62a08;hpb=08e9b2cc12acb3ac293a1dba4a03efb71c20b39d;p=friendica.git diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php index 0a12e62829..3382884839 100644 --- a/src/Util/ParseUrl.php +++ b/src/Util/ParseUrl.php @@ -1,6 +1,6 @@ * @endverbatim */ - public static function getSiteinfo(string $url, bool $do_oembed = true, int $count = 1) + public static function getSiteinfo(string $url, bool $do_oembed = true, int $count = 1): array { if (empty($url)) { return [ @@ -214,7 +216,7 @@ class ParseUrl ]; if ($count > 10) { - Logger::notice('Endless loop detected', ['url' => $url]); + Logger::warning('Endless loop detected', ['url' => $url]); return $siteinfo; } @@ -283,25 +285,13 @@ class ParseUrl } $charset = ''; - // Look for a charset, first in headers - // Expected form: Content-Type: text/html; charset=ISO-8859-4 - if (preg_match('/charset=([a-z0-9-_.\/]+)/i', $curlResult->getContentType(), $matches)) { - $charset = trim(trim(trim(array_pop($matches)), ';,')); - } - - // Then in body that gets precedence - // Expected forms: - // - - // - - // - - // - - // We escape