strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #10576 from annando/conversation-uid

Browse source 
Fix multiple display problems in conversations
This commit is contained in:
Hypolite Petovan 2021-08-05 12:09:35 -04:00 committed by GitHub
commit 63906bc120
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/conversation.php
View file

@ -757,6 +757,10 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
$items = []; $items = [];
while ($row = Post::fetch($thread_items)) { while ($row = Post::fetch($thread_items)) {
if (!empty($items[$row['uri-id']]) && ($row['uid'] == 0)) {
continue;
}
if ($max_comments > 0) { if ($max_comments > 0) {
if (($row['gravity'] == GRAVITY_COMMENT) && (++$commentcounter[$row['parent-uri-id']] > $max_comments)) { if (($row['gravity'] == GRAVITY_COMMENT) && (++$commentcounter[$row['parent-uri-id']] > $max_comments)) {
continue; continue;
@ -765,7 +769,7 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
continue; continue;
} }
} }
$items[] = conversation_add_row_information($row, $activities[$row['uri-id']] ?? []); $items[$row['uri-id']] = conversation_add_row_information($row, $activities[$row['uri-id']] ?? []);
} }
DBA::close($thread_items); DBA::close($thread_items);