clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7342 from MrPetovan/bug/fatal-errors 

Ensure $link_item variable type when calling get_responses() in mod/photos
This commit is contained in:
Michael Vogel 2019-07-06 08:16:06 +02:00 committed by GitHub
parent f60792348a f92752c9b4
commit e6ac576903
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mod/photos.php
View File

@ -1320,6 +1320,7 @@ function photos_content(App $a)
if (DBA::isResult($linked_items)) {
// This is a workaround to not being forced to rewrite the while $sql_extra handling
// @TODO: On old photo items without a matching thread record, this sets $link_item to false
$link_item = Item::selectFirst([], ['id' => $linked_items[0]['id']]);
$condition = ["`parent` = ? AND `parent` != `id`", $link_item['parent']];
@ -1538,7 +1539,7 @@ function photos_content(App $a)
}
$response_verbs = ['like'];
$response_verbs[] = 'dislike';
$responses = get_responses($conv_responses, $response_verbs, $link_item);
$responses = get_responses($conv_responses, $response_verbs, $link_item ?: []);
$paginate = $pager->renderFull($total);
}