From dde2cf6ac0cef2a51c149774e810d8a1151846d4 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 26 Jan 2020 16:43:14 -0500 Subject: [PATCH] Throw not found exception when photo item doesn't exist in prepare_photo_data() - Addresses part of https://github.com/friendica/friendica/issues/8000#issuecomment-573883153 --- include/api.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/api.php b/include/api.php index 92b4e4b21..43659db07 100644 --- a/include/api.php +++ b/include/api.php @@ -311,9 +311,7 @@ function api_call(App $a, App\Arguments $args = null) } $called_api = explode("/", $p); - //unset($_SERVER['PHP_AUTH_USER']); - /// @TODO should be "true ==[=] $info['auth']", if you miss only one = character, you assign a variable (only with ==). Let's make all this even. if (!empty($info['auth']) && api_user() === false) { api_login($a); } @@ -5027,6 +5025,9 @@ function prepare_photo_data($type, $scale, $photo_id) // retrieve item element for getting activities (like, dislike etc.) related to photo $condition = ['uid' => local_user(), 'resource-id' => $photo_id, 'type' => 'photo']; $item = Item::selectFirstForUser(local_user(), ['id'], $condition); + if (!DBA::isResult($item)) { + throw new NotFoundException('Photo-related item not found.'); + } $data['photo']['friendica_activities'] = api_format_items_activities($item, $type);