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

IHTTPResult::getContentType is now a string again

Browse source
This commit is contained in:
Philipp 2021-08-20 19:48:21 +02:00
parent 82f767f2ee
commit 26401e88b8
No known key found for this signature in database
GPG key ID: 9A28B7D4FF5667BD
9 changed files with 22 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Util/ParseUrl.php
View file

@ -272,10 +272,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