X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=6fdfd30b466502e2070968a7f1c3acfce22be7cf;hb=b837c487c5ead3228298d7e96f9e096457829488;hp=375dda726a39a627dae180362a97f126b4b85a46;hpb=51e9b257005550d28681f431a8bcd1cf0fda9e65;p=friendica.git diff --git a/include/conversation.php b/include/conversation.php index 375dda726a..6fdfd30b46 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -771,7 +771,7 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid) $items = []; foreach ($parents AS $parent) { - $condition = ["`item`.`parent-uri` = ? AND `item`.`uid` IN (0, ?) AND `vid` != ? ", + $condition = ["`item`.`parent-uri` = ? AND `item`.`uid` IN (0, ?) AND `vid` != ?", $parent['uri'], $uid, Verb::getID(Activity::FOLLOW)]; $items = conversation_fetch_items($parent, $items, $condition, $block_authors, $params); } @@ -799,7 +799,7 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid) */ function conversation_fetch_items(array $parent, array $items, array $condition, bool $block_authors, array $params) { if ($block_authors) { - $condition[0] .= "AND NOT `author`.`hidden`"; + $condition[0] .= " AND NOT `author`.`hidden`"; } $thread_items = Item::selectForUser(local_user(), array_merge(Item::DISPLAY_FIELDLIST, ['contact-uid', 'gravity']), $condition, $params); @@ -823,7 +823,7 @@ function item_photo_menu($item) { $block_link = ''; $ignore_link = ''; - if (local_user() && local_user() == $item['uid'] && $item['parent'] == $item['id'] && !$item['self']) { + if (local_user() && local_user() == $item['uid'] && $item['gravity'] == GRAVITY_PARENT && !$item['self']) { $sub_link = 'javascript:dosubthread(' . $item['id'] . '); return false;'; }