From be0459a98b9c047e4cf89b835fd35a32da51ca31 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 14 Jun 2015 21:08:00 -0700 Subject: convert the abook fields --- mod/channel.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'mod/channel.php') diff --git a/mod/channel.php b/mod/channel.php index c0f1f419f..9a98ade60 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -175,11 +175,10 @@ function channel_content(&$a, $update = 0, $load = false) { left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids ) WHERE uid = %d $item_normal AND item_wall = 1 AND item_unseen = 1 - AND ((abook.abook_flags & %d) = 0 or abook.abook_flags is null) + AND (abook.blocked = 0 or abook.abook_flags is null) $sql_extra ORDER BY created DESC", - intval($a->profile['profile_uid']), - intval(ABOOK_FLAG_BLOCKED) + intval($a->profile['profile_uid']) ); $_SESSION['loadtime'] = datetime_convert(); } @@ -221,11 +220,10 @@ function channel_content(&$a, $update = 0, $load = false) { left join abook on item.author_xchan = abook.abook_xchan WHERE uid = %d $item_normal AND item_wall = 1 and item_thread_top = 1 - AND ((abook.abook_flags & %d) = 0 or abook.abook_flags is null) + AND (abook_blocked = 0 or abook.abook_flags is null) $sql_extra $sql_extra2 ORDER BY created DESC $pager_sql ", - intval($a->profile['profile_uid']), - intval(ABOOK_FLAG_BLOCKED) + intval($a->profile['profile_uid']) ); } } -- cgit v1.2.3