jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Throw not found exception when photo item doesn't exist in prepare_photo_data()

Browse source 
- Addresses part of https://github.com/friendica/friendica/issues/8000#issuecomment-573883153
This commit is contained in:
Hypolite Petovan 2020-01-26 16:43:14 -05:00
parent 9475383c4f
commit dde2cf6ac0
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/api.php
View file

@ -311,9 +311,7 @@ function api_call(App $a, App\Arguments $args = null)
} }
$called_api = explode("/", $p); $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) { if (!empty($info['auth']) && api_user() === false) {
api_login($a); 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 // retrieve item element for getting activities (like, dislike etc.) related to photo
$condition = ['uid' => local_user(), 'resource-id' => $photo_id, 'type' => 'photo']; $condition = ['uid' => local_user(), 'resource-id' => $photo_id, 'type' => 'photo'];
$item = Item::selectFirstForUser(local_user(), ['id'], $condition); $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); $data['photo']['friendica_activities'] = api_format_items_activities($item, $type);