strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #10949 from annando/photo-octet

Browse source 
Accept photo fetching for octet-stream as well
This commit is contained in:
Hypolite Petovan 2021-11-02 10:31:43 -04:00 committed by GitHub
parent 4a0127bcee 1f7a3fb698
commit af8114af37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Module/Photo.php
View file

@ -289,13 +289,17 @@ class Photo extends BaseModule
$mimetext = '';
if (!empty($url)) {
$mime = ParseUrl::getContentType($url);
if (empty($mime) || ($mime[0] != 'image')) {
$url = '';
} else {
if (!empty($mime)) {
$mimetext = $mime[0] . '/' . $mime[1];
} else {
Logger::info('Invalid file', ['url' => $url]);
}
if (!empty($mimetext) && ($mime[0] != 'image') && ($mimetext != 'application/octet-stream')) {
Logger::info('Unexpected Content-Type', ['mime' => $mimetext, 'url' => $url]);
$mimetext = '';
}
}
if (empty($url)) {
if (empty($mimetext)) {
if ($customsize <= Proxy::PIXEL_MICRO) {
$url = Contact::getDefaultAvatar($contact, Proxy::SIZE_MICRO);
} elseif ($customsize <= Proxy::PIXEL_THUMB) {