Merge pull request #6256 from MrPetovan/bug/6255-hide-connect-remote

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 1c97a1abe4e074ff1b5b8875c3ba01245cb75e63..b129b7d14d075a492a226355b5bb20b1a4783b66 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -497,7 +497,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
                        }
                }
        } elseif ($mode === 'notes') {
-               $items = conversation_add_children($items, false, $order, $uid);
+               $items = conversation_add_children($items, false, $order, local_user());
                $profile_owner = local_user();
 
                if (!$update) {
@@ -798,7 +798,7 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
 
        foreach ($parents AS $parent) {
                $condition = ["`item`.`parent-uri` = ? AND `item`.`uid` IN (0, ?) ",
-                       $parent['uri'], local_user()];
+                       $parent['uri'], $uid];
                if ($block_authors) {
                        $condition[0] .= "AND NOT `author`.`hidden`";
                }