Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 18:30:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/2021.12-rc' into api-fixes

Browse source
This commit is contained in:
Michael 2021-11-30 05:48:03 +00:00
commit 7dd757b7f9
25 changed files with 690 additions and 371 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/api.php
View file

@ -518,7 +518,7 @@ function prepare_photo_data($type, $scale, $photo_id, $uid)
// retrieve item element for getting activities (like, dislike etc.) related to photo
$condition = ['uid' => $uid, 'resource-id' => $photo_id];
$item = Post::selectFirst(['id', 'uid', 'uri', 'parent', 'allow_cid', 'deny_cid', 'allow_gid', 'deny_gid'], $condition);
$item = Post::selectFirst(['id', 'uid', 'uri', 'uri-id', 'parent', 'allow_cid', 'deny_cid', 'allow_gid', 'deny_gid'], $condition);
if (!DBA::isResult($item)) {
throw new NotFoundException('Photo-related item not found.');
}