Merge pull request #10576 from annando/conversation-uid

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 6a6eff28dc2c2d0dded37fafa7de0eb5f3e43079..db2d33b47db84a30aac5e79350e449b251e7a89d 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -717,7 +717,7 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
                $max_comments = DI::config()->get('system', 'max_display_comments', 1000);
        }
 
-       $params = ['order' => ['uri-id' => true]];
+       $params = ['order' => ['uri-id' => true, 'uid' => true]];
 
        $activities      = [];
        $uriids          = [];
@@ -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);