Avoid a notice

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index bda4ae610758227829f03506933146ceb3962e2c..58e147d1f70d4d97431c9161b562f5ef3d21b86c 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -771,7 +771,7 @@ function networkThreadedView(App $a, $update, $parent)
                        FROM `item` $sql_post_table
                        STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                                AND (NOT `contact`.`blocked` OR `contact`.`pending`)
-                               AND (`item`.`parent-uri` != `item`.`uri`
+                               AND (`item`.`gravity` != %d
                                        OR `contact`.`uid` = `item`.`uid` AND `contact`.`self`
                                        OR `contact`.`rel` IN (%d, %d) AND NOT `contact`.`readonly`)
                        LEFT JOIN `user-item` ON `user-item`.`iid` = `item`.`id` AND `user-item`.`uid` = %d
@@ -780,6 +780,7 @@ function networkThreadedView(App $a, $update, $parent)
                        AND NOT `item`.`moderated` AND $sql_extra4
                        $sql_extra3 $sql_extra $sql_range $sql_nets
                        ORDER BY `order_date` DESC LIMIT 100",
+                       intval(GRAVITY_PARENT),
                        intval(Contact::SHARING),
                        intval(Contact::FRIEND),
                        intval(local_user()),
@@ -791,7 +792,7 @@ function networkThreadedView(App $a, $update, $parent)
                        STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
                                AND (NOT `contact`.`blocked` OR `contact`.`pending`)
                        STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
-                               AND (`item`.`parent-uri` != `item`.`uri`
+                               AND (`item`.`gravity` != %d
                                        OR `contact`.`uid` = `item`.`uid` AND `contact`.`self`
                                        OR `contact`.`rel` IN (%d, %d) AND NOT `contact`.`readonly`)
                        LEFT JOIN `user-item` ON `user-item`.`iid` = `item`.`id` AND `user-item`.`uid` = %d
@@ -800,6 +801,7 @@ function networkThreadedView(App $a, $update, $parent)
                        AND (`user-item`.`hidden` IS NULL OR NOT `user-item`.`hidden`)
                        $sql_extra2 $sql_extra3 $sql_range $sql_extra $sql_nets
                        ORDER BY `order_date` DESC $pager_sql",
+                       intval(GRAVITY_PARENT),
                        intval(Contact::SHARING),
                        intval(Contact::FRIEND),
                        intval(local_user()),
@@ -808,7 +810,7 @@ function networkThreadedView(App $a, $update, $parent)
        }
 
        // Only show it when unfiltered (no groups, no networks, ...)
-       if (in_array($nets, ['', Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]) && (strlen($sql_extra . $sql_extra2 . $sql_extra3) == 0)) {
+       if (in_array($nets, ['', Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]) && (strlen($sql_extra . $sql_extra2 . $sql_extra3) == 0)) {
                if (DBA::isResult($r)) {
                        $top_limit = current($r)['order_date'];
                        $bottom_limit = end($r)['order_date'];