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

Fix IHTTPResult::getHeader()

Browse source 
- Now returns a string array, like expected
- Fix usages
- Fix dataset
This commit is contained in:
Philipp 2021-08-20 19:48:20 +02:00
parent 3c074ab315
commit 803c1d71de
No known key found for this signature in database
GPG key ID: 9A28B7D4FF5667BD
11 changed files with 67 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Model/Photo.php
View file

@ -492,16 +492,17 @@ class Photo
if (!empty($image_url)) {
$ret = DI::httpRequest()->get($image_url);
$img_str = $ret->getBody();
$type = $ret->getContentType();
$contType = $ret->getContentType();
} else {
$img_str = '';
$contType = [];
}
if ($quit_on_error && ($img_str == "")) {
return false;
}
$type = Images::getMimeTypeByData($img_str, $image_url, $type);
$type = Images::getMimeTypeByData($img_str, $image_url, $contType);
$Image = new Image($img_str, $type);
if ($Image->isValid()) {

6
src/Model/User.php
View file

@ -1095,13 +1095,13 @@ class User
$curlResult = DI::httpRequest()->get($photo);
if ($curlResult->isSuccess()) {
$img_str = $curlResult->getBody();
$type = $curlResult->getContentType();
$contType = $curlResult->getContentType();
} else {
$img_str = '';
$type = '';
$contType = [];
}
$type = Images::getMimeTypeByData($img_str, $photo, $type);
$type = Images::getMimeTypeByData($img_str, $photo, $contType);
$Image = new Image($img_str, $type);
if ($Image->isValid()) {