Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-30 00:24:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Fix IHTTPResult::getHeader() - Now returns a string array, like expected - Fix usages - Fix dataset"

Browse source 
This reverts commit 80bd0a4d
This commit is contained in:
Philipp 2020-10-11 23:25:40 +02:00
parent 6fcbb9866f
commit 0449077126
No known key found for this signature in database
GPG key ID: 9A28B7D4FF5667BD
11 changed files with 59 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Util/ParseUrl.php
View file

@ -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