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

Improved error message for external resources

Browse source
This commit is contained in:
Michael 2021-08-06 04:02:42 +00:00
parent 4bc3e8c141
commit a8442e41ab
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Module/Photo.php
View file

@ -118,8 +118,14 @@ class Photo extends BaseModule
$data = microtime(true) - $stamp; $data = microtime(true) - $stamp;
if (empty($imgdata)) { if (empty($imgdata)) {
Logger::warning("Invalid photo with id {$photo["id"]}."); Logger::warning('Invalid photo', ['id' => $photo['id']]);
throw new \Friendica\Network\HTTPException\InternalServerErrorException(DI::l10n()->t('Invalid photo with id %s.', $photo["id"])); if (in_array($photo['backend-class'], [ExternalResource::NAME])) {
$reference = json_decode($photo['backend-ref'], true);
$error = DI::l10n()->t('Invalid external resource with url %s.', $reference['url']);
} else {
$error = DI::l10n()->t('Invalid photo with id %s.', $photo['id']);
}
throw new \Friendica\Network\HTTPException\InternalServerErrorException($error);
} }
// if customsize is set and image is not a gif, resize it // if customsize is set and image is not a gif, resize it