X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnetwork.php;h=fddec60c8dc86457e1273d551adb2d766e63babb;hb=5f2028b657332c7dceb1e14dc0e1cd175fc61a7c;hp=3e19cbce4dd8ae5b24922998f38bdd3d003d3e5e;hpb=6bb418c5a7cdd71d28a8a572059efb14401b70bd;p=friendica.git diff --git a/mod/network.php b/mod/network.php index 3e19cbce4d..fddec60c8d 100644 --- a/mod/network.php +++ b/mod/network.php @@ -643,7 +643,7 @@ function networkThreadedView(App $a, $update, $parent) // NOTREACHED } - $contacts = Group::expand([$gid]); + $contacts = Group::expand(local_user(), [$gid]); if ((is_array($contacts)) && count($contacts)) { $contact_str_self = ''; @@ -868,10 +868,10 @@ function networkThreadedView(App $a, $update, $parent) (SELECT SUBSTR(`term`, 2) FROM `search` WHERE `uid` = ? AND `term` LIKE '#%') AND `otype` = ? AND `type` = ? AND `uid` = 0) AS `term` ON `item`.`id` = `term`.`oid` STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `item`.`author-id` - WHERE `item`.`uid` = 0 AND `item`.$ordering < ? AND `item`.$ordering > ? + WHERE `item`.`uid` = 0 AND `item`.$ordering < ? AND `item`.$ordering > ? AND `item`.`gravity` = ? AND NOT `author`.`hidden` AND NOT `author`.`blocked`" . $sql_tag_nets, local_user(), TERM_OBJ_POST, TERM_HASHTAG, - $top_limit, $bottom_limit); + $top_limit, $bottom_limit, GRAVITY_PARENT); $data = DBA::toArray($items);