From e916d71cc5c92613fb69f4aeead817bf5bb1c2fc Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 26 Nov 2012 23:52:16 -0800 Subject: basic (very basic) communication showing up on network page --- mod/channel.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'mod/channel.php') 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) ); -- cgit v1.2.3