bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Images::getInfoFromURL[Cached]() will both return empty arrays on error and

Browse source 
that needs to be reflected here, too.
This commit is contained in:
Roland Häder 2022-06-22 17:18:39 +02:00
parent eb231bc548
commit b996712ef7
Signed by: roland
GPG key ID: C82EDE5DDFA0BA77
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Content/Text/BBCode.php
View file

@ -111,7 +111,7 @@ class BBCode
$picturedata = Images::getInfoFromURLCached($matches[1]); $picturedata = Images::getInfoFromURLCached($matches[1]);
if ($picturedata) { if (!empty($picturedata)) {
if (($picturedata[0] >= 500) && ($picturedata[0] >= $picturedata[1])) { if (($picturedata[0] >= 500) && ($picturedata[0] >= $picturedata[1])) {
$post['image'] = $matches[1]; $post['image'] = $matches[1];
} else { } else {
@ -320,7 +320,7 @@ class BBCode
$post['text'] = trim(str_replace($pictures[0][0], '', $body)); $post['text'] = trim(str_replace($pictures[0][0], '', $body));
} else { } else {
$imgdata = Images::getInfoFromURLCached($pictures[0][1]); $imgdata = Images::getInfoFromURLCached($pictures[0][1]);
if ($imgdata && substr($imgdata['mime'], 0, 6) == 'image/') { if (!empty($imgdata) && substr($imgdata['mime'], 0, 6) == 'image/') {
$post['type'] = 'photo'; $post['type'] = 'photo';
$post['image'] = $pictures[0][1]; $post['image'] = $pictures[0][1];
$post['preview'] = $pictures[0][2]; $post['preview'] = $pictures[0][2];

7
src/Protocol/OStatus.php
View file

@ -1377,7 +1377,7 @@ class OStatus
case 'photo': case 'photo':
if (!empty($siteinfo['image'])) { if (!empty($siteinfo['image'])) {
$imgdata = Images::getInfoFromURLCached($siteinfo['image']); $imgdata = Images::getInfoFromURLCached($siteinfo['image']);
if ($imgdata) { if (!empty($imgdata)) {
$attributes = [ $attributes = [
'rel' => 'enclosure', 'rel' => 'enclosure',
'href' => $siteinfo['image'], 'href' => $siteinfo['image'],
@ -1388,6 +1388,7 @@ class OStatus
} }
} }
break; break;
case 'video': case 'video':
$attributes = [ $attributes = [
'rel' => 'enclosure', 'rel' => 'enclosure',
@ -1398,13 +1399,15 @@ class OStatus
]; ];
XML::addElement($doc, $root, 'link', '', $attributes); XML::addElement($doc, $root, 'link', '', $attributes);
break; break;
default: default:
Logger::warning('Unsupported type', ['type' => $siteinfo['type'], 'url' => $siteinfo['url']]);
break; break;
} }
if (!DI::config()->get('system', 'ostatus_not_attach_preview') && ($siteinfo['type'] != 'photo') && isset($siteinfo['image'])) { if (!DI::config()->get('system', 'ostatus_not_attach_preview') && ($siteinfo['type'] != 'photo') && isset($siteinfo['image'])) {
$imgdata = Images::getInfoFromURLCached($siteinfo['image']); $imgdata = Images::getInfoFromURLCached($siteinfo['image']);
if ($imgdata) { if (!empty($imgdata)) {
$attributes = [ $attributes = [
'rel' => 'enclosure', 'rel' => 'enclosure',
'href' => $siteinfo['image'], 'href' => $siteinfo['image'],