From e940b1f04700a233df48df7ce2b7e6475fad0dba Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 5 Aug 2021 15:57:51 +0000
Subject: [PATCH] Fix multiple display problems in conversations

---
 include/conversation.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/conversation.php b/include/conversation.php
index 93ec728baa..db2d33b47d 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -757,6 +757,10 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
 	$items = [];
 
 	while ($row = Post::fetch($thread_items)) {
+		if (!empty($items[$row['uri-id']]) && ($row['uid'] == 0)) {
+			continue;
+		}
+
 		if ($max_comments > 0) {
 			if (($row['gravity'] == GRAVITY_COMMENT) && (++$commentcounter[$row['parent-uri-id']] > $max_comments)) {
 				continue;
@@ -765,7 +769,7 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
 				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);