Merge pull request #4798 from MrPetovan/bug/prevent-empty-uid-in-preloadconfigadapter

Prevent empty $uid from messing up the PreloadConfigAdapter

diff --git a/mod/network.php b/mod/network.php
index 26645eefdcd780e24f49ad89bd8e50d32a8aa3e5..a35f0619beb9ecac212dc1255257175f048c1307 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -771,7 +771,9 @@ 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` OR `contact`.`rel` IN (%d, %d) AND NOT `contact`.`readonly`)
+                               AND (`item`.`parent-uri` != `item`.`uri`
+                                       OR `contact`.`uid` = `item`.`uid` AND `contact`.`self`
+                                       OR `contact`.`rel` IN (%d, %d) AND NOT `contact`.`readonly`)
                        WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted`
                        AND NOT `item`.`moderated` AND $sql_extra4
                        $sql_extra3 $sql_extra $sql_range $sql_nets
@@ -786,7 +788,9 @@ 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` OR `contact`.`rel` IN (%d, %d) AND NOT `contact`.`readonly`)
+                               AND (`item`.`parent-uri` != `item`.`uri`
+                                       OR `contact`.`uid` = `item`.`uid` AND `contact`.`self`
+                                       OR `contact`.`rel` IN (%d, %d) AND NOT `contact`.`readonly`)
                        WHERE `thread`.`uid` = %d AND `thread`.`visible` AND NOT `thread`.`deleted`
                        AND NOT `thread`.`moderated`
                        $sql_extra2 $sql_extra3 $sql_range $sql_extra $sql_nets
@@ -833,7 +837,9 @@ 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` ON `contact`.`id` = `item`.`author-id`
-                               AND (`item`.`parent-uri` != `item`.`uri` OR `contact`.`rel` IN (?, ?) AND NOT `contact`.`readonly`)
+                               AND (`item`.`parent-uri` != `item`.`uri`
+                                       OR `contact`.`uid` = `item`.`uid` AND `contact`.`self`
+                                       OR `contact`.`rel` IN (?, ?) AND NOT `contact`.`readonly`)
                        WHERE `item`.`uid` = 0 AND `item`.$ordering < ? AND `item`.$ordering > ?
                                AND NOT `contact`.`hidden` AND NOT `contact`.`blocked`" . $sql_tag_nets,
                        local_user(), TERM_OBJ_POST, TERM_HASHTAG,