clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix IHTTPResult::getHeader()

Browse Source 
- Now returns a string array, like expected
- Fix usages
- Fix dataset
This commit is contained in:
Philipp
2020-10-09 22:28:41 +02:00
parent f3cd973cbe
commit 80bd0a4d5a
11 changed files with 68 additions and 59 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 (($curlResult->getContentType() != '') && !strstr(strtolower($curlResult->getContentType()), 'html')) {
if (!in_array('html', $curlResult->getContentType())) {
return $siteinfo;
}
@@ -198,8 +198,10 @@ 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)), ';,'));
foreach ($curlResult->getContentType() as $type) {
if (preg_match('/charset=([a-z0-9-_.\/]+)/i', $type, $matches)) {
$charset = trim(trim(trim(array_pop($matches)), ';,'));
}
}
// Then in body that gets precedence