bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #7287 from annando/issue-6477

Browse source 
Issue 6477: Use the correct content-type to resize the images
This commit is contained in:
Hypolite Petovan 2019-06-20 19:32:02 -04:00 committed by GitHub
parent f0849b0a93 14c28868eb
commit 1644648447
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Model/Contact.php
View file

@ -1737,17 +1737,14 @@ class Contact extends BaseObject
$photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);
if ($photos) {
DBA::update(
'contact',
['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()],
['id' => $cid]
);
$fields = ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()];
DBA::update('contact', $fields, ['id' => $cid]);
// Update the public contact (contact id = 0)
if ($uid != 0) {
$pcontact = DBA::selectFirst('contact', ['id'], ['nurl' => $contact['nurl'], 'uid' => 0]);
if (DBA::isResult($pcontact)) {
self::updateAvatar($avatar, 0, $pcontact['id'], $force);
DBA::update('contact', $fields, ['id' => $pcontact['id']]);
}
}

9
src/Model/Photo.php
View file

@ -414,7 +414,9 @@ class Photo extends BaseObject
$filename = basename($image_url);
if (!empty($image_url)) {
$img_str = Network::fetchUrl($image_url, true);
$ret = Network::curl($image_url, true);
$img_str = $ret->getBody();
$type = $ret->getContentType();
} else {
$img_str = '';
}
@ -423,7 +425,10 @@ class Photo extends BaseObject
return false;
}
$type = Image::guessType($image_url, true);
if (empty($type)) {
$type = Image::guessType($image_url, true);
}
$Image = new Image($img_str, $type);
if ($Image->isValid()) {
$Image->scaleToSquare(300);