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

Merge pull request #10069 from annando/notice-fatal

Browse source 
Avoid fatal errors and notices
This commit is contained in:
Hypolite Petovan 2021-03-23 23:51:45 -04:00 committed by GitHub
parent aaf94531a9 fb663f0668
commit b94f442dd8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Object/Image.php
View file

@ -541,7 +541,12 @@ class Image
do { do {
// FIXME - implement horizontal bias for scaling as in following GD functions // FIXME - implement horizontal bias for scaling as in following GD functions
// to allow very tall images to be constrained only horizontally. // to allow very tall images to be constrained only horizontally.
$this->image->scaleImage($dest_width, $dest_height); try {
$this->image->scaleImage($dest_width, $dest_height);
} catch (Exception $e) {
// Imagick couldn't use the data
return false;
}
} while ($this->image->nextImage()); } while ($this->image->nextImage());
// These may not be necessary anymore // These may not be necessary anymore

33
src/Util/ParseUrl.php
View file

@ -512,19 +512,20 @@ class ParseUrl
{ {
if (!empty($siteinfo['images'])) { if (!empty($siteinfo['images'])) {
array_walk($siteinfo['images'], function (&$image) use ($page_url) { array_walk($siteinfo['images'], function (&$image) use ($page_url) {
$image = [];
// According to the specifications someone could place a picture url into the content field as well. // According to the specifications someone could place a picture url into the content field as well.
// But this doesn't seem to happen in the wild, so we don't cover it here. // But this doesn't seem to happen in the wild, so we don't cover it here.
$image['url'] = self::completeUrl($image['url'], $page_url); if (!empty($image['url'])) {
$photodata = Images::getInfoFromURLCached($image['url']); $image['url'] = self::completeUrl($image['url'], $page_url);
if (!empty($photodata) && ($photodata[0] > 50) && ($photodata[1] > 50)) { $photodata = Images::getInfoFromURLCached($image['url']);
$image['src'] = $image['url']; if (!empty($photodata) && ($photodata[0] > 50) && ($photodata[1] > 50)) {
$image['width'] = $photodata[0]; $image['src'] = $image['url'];
$image['height'] = $photodata[1]; $image['width'] = $photodata[0];
$image['contenttype'] = $photodata['mime']; $image['height'] = $photodata[1];
unset($image['url']); $image['contenttype'] = $photodata['mime'];
ksort($image); unset($image['url']);
} else { ksort($image);
$image = []; }
} }
}); });
@ -542,7 +543,7 @@ class ParseUrl
if (!empty($media[$field])) { if (!empty($media[$field])) {
$media[$field] = self::completeUrl($media[$field], $page_url); $media[$field] = self::completeUrl($media[$field], $page_url);
$type = self::getContentType($media[$field]); $type = self::getContentType($media[$field]);
if ($type[0] == 'text') { if (($type[0] ?? '') == 'text') {
if ($field == 'embed') { if ($field == 'embed') {
$embed = $media[$field]; $embed = $media[$field];
} else { } else {
@ -685,7 +686,9 @@ class ParseUrl
{ {
if (!empty($jsonld['@graph']) && is_array($jsonld['@graph'])) { if (!empty($jsonld['@graph']) && is_array($jsonld['@graph'])) {
foreach ($jsonld['@graph'] as $part) { foreach ($jsonld['@graph'] as $part) {
$siteinfo = self::parseParts($siteinfo, $part); if (!empty($part)) {
$siteinfo = self::parseParts($siteinfo, $part);
}
} }
} elseif (!empty($jsonld['@type'])) { } elseif (!empty($jsonld['@type'])) {
$siteinfo = self::parseJsonLd($siteinfo, $jsonld); $siteinfo = self::parseJsonLd($siteinfo, $jsonld);
@ -699,7 +702,9 @@ class ParseUrl
} }
if ($numeric_keys) { if ($numeric_keys) {
foreach ($jsonld as $part) { foreach ($jsonld as $part) {
$siteinfo = self::parseParts($siteinfo, $part); if (!empty($part)) {
$siteinfo = self::parseParts($siteinfo, $part);
}
} }
} }
} }