basic (very basic) communication showing up on network page

3 files changed, 10 insertions, 7 deletions

diff --git a/include/items.php b/include/items.php
index ed1c08b68..47b919bc6 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1167,7 +1167,7 @@ function item_store($arr,$force_parent = false) {
 		$allow_gid = $arr['allow_gid'];
 		$deny_cid  = $arr['deny_cid'];
 		$deny_gid  = $arr['deny_gid'];
-		$arr['item_flags'] = $arr['item_flags'] | ITEM_TOP_THREAD;
+		$arr['item_flags'] = $arr['item_flags'] | ITEM_THREAD_TOP;
 	}
 	else { 
 
diff --git a/mod/channel.php b/mod/channel.php
index 01803a4aa..de5df649e 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -165,12 +165,14 @@ function channel_content(&$a, $update = 0) {
 		$r = q("SELECT distinct(parent) AS `item_id` from item
 			left join abook on item.author_xchan = abook.abook_xchan
 			WHERE uid = %d AND item_restrict = 0
-			AND (item_flags &  %d)
+			AND (item_flags &  %d) AND ( item_flags & %d ) AND ( item_flags & %d )
 			AND ((abook.abook_flags & %d) = 0 or abook.abook_flags is null)
 			$sql_extra
 			ORDER BY created DESC",
 			intval($a->profile['profile_uid']),
-			intval(ITEM_WALL|ITEM_UNSEEN|ITEM_THREAD_TOP),
+			intval(ITEM_WALL),
+			intval(ITEM_UNSEEN),
+			intval(ITEM_THREAD_TOP),
 			intval(ABOOK_FLAG_BLOCKED)
 		);
 
@@ -196,12 +198,13 @@ function channel_content(&$a, $update = 0) {
 		$r = q("SELECT id AS item_id FROM item 
 			left join abook on item.author_xchan = abook.abook_xchan
 			WHERE uid = %d AND item_restrict = 0
-			AND (item_flags &  %d)
+			AND (item_flags &  %d) and (item_flags & %d)
 			AND ((abook.abook_flags & %d) = 0 or abook.abook_flags is null)
 			$sql_extra $sql_extra2
 			ORDER BY created DESC $pager_sql ",
 			intval($a->profile['profile_uid']),
-			intval(ITEM_WALL|ITEM_THREAD_TOP),
+			intval(ITEM_WALL),
+			intval(ITEM_THREAD_TOP),
 			intval(ABOOK_FLAG_BLOCKED)
 
 		);
diff --git a/mod/network.php b/mod/network.php
index 3ed4d2f59..a0f4ab354 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -666,7 +666,7 @@ function network_content(&$a, $update = 0, $load = false) {
 			);
 		}
 		else {
-
+dbg(1);
 			$r = q("SELECT item.id AS item_id FROM item 
 				left join abook on item.author_xchan = abook.abook_xchan
 				WHERE item.uid = %d AND item.item_restrict = 0
@@ -677,7 +677,7 @@ function network_content(&$a, $update = 0, $load = false) {
 				intval(local_user()),
 				intval(ABOOK_FLAG_BLOCKED)
 			);
-
+dbg(0);
 		}
 
 		// Then fetch all the children of the parents that are on this page