X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FPhoto.php;h=0a0b6d3208399d1f44c3fc70242e57477174d786;hb=0031b4e18cff5ded33c5f8599d6d93ea090986ff;hp=2cb29af5f6b348c45f730fbf8927cf2a78373828;hpb=097620b62799c96d610d73410ec07a6b8cdf82f0;p=friendica.git diff --git a/src/Module/Photo.php b/src/Module/Photo.php index 2cb29af5f6..0a0b6d3208 100644 --- a/src/Module/Photo.php +++ b/src/Module/Photo.php @@ -23,8 +23,8 @@ namespace Friendica\Module; use Friendica\BaseModule; use Friendica\Core\Logger; -use Friendica\Core\System; use Friendica\DI; +use Friendica\Model\Contact; use Friendica\Model\Photo as MPhoto; /** @@ -84,13 +84,13 @@ class Photo extends BaseModule } $photo = MPhoto::getPhoto($photoid, $scale); if ($photo === false) { - $photo = MPhoto::createPhotoForSystemResource("images/nosign.jpg"); + throw new \Friendica\Network\HTTPException\NotFoundException(DI::l10n()->t('The Photo with id %s is not available.', $photoid)); } break; } if ($photo === false) { - System::httpExit('404', 'Not Found'); + throw new \Friendica\Network\HTTPException\NotFoundException(); } $cacheable = ($photo["allow_cid"] . $photo["allow_gid"] . $photo["deny_cid"] . $photo["deny_gid"] === "") && (isset($photo["cacheable"]) ? $photo["cacheable"] : true); @@ -139,16 +139,16 @@ class Photo extends BaseModule case "profile": case "custom": $scale = 4; - $default = "images/person-300.jpg"; + $default = Contact::DEFAULT_AVATAR_PHOTO; break; case "micro": $scale = 6; - $default = "images/person-48.jpg"; + $default = Contact::DEFAULT_AVATAR_MICRO; break; case "avatar": default: $scale = 5; - $default = "images/person-80.jpg"; + $default = Contact::DEFAULT_AVATAR_THUMB; } $photo = MPhoto::selectFirst([], ["scale" => $scale, "uid" => $uid, "profile" => 1]);