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/public.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'mod/public.php') diff --git a/mod/public.php b/mod/public.php index 6a4e6a334..fe3f3aa21 100644 --- a/mod/public.php +++ b/mod/public.php @@ -105,10 +105,9 @@ function public_content(&$a, $update = 0, $load = false) { left join abook on item.author_xchan = abook.abook_xchan WHERE true $uids $item_normal AND item.parent = item.id - and ((abook.abook_flags & %d) = 0 or abook.abook_flags is null) + and (abook.abook_blocked = 0 or abook.abook_flags is null) $sql_extra3 $sql_extra $sql_nets - ORDER BY $ordering DESC $pager_sql ", - intval(ABOOK_FLAG_BLOCKED) + ORDER BY $ordering DESC $pager_sql " ); @@ -119,9 +118,8 @@ function public_content(&$a, $update = 0, $load = false) { left join abook on item.author_xchan = abook.abook_xchan WHERE true $uids $item_normal AND item.parent = item.id $simple_update - and ((abook.abook_flags & %d) = 0 or abook.abook_flags is null) - $sql_extra3 $sql_extra $sql_nets", - intval(ABOOK_FLAG_BLOCKED) + and (abook.abook_blocked = 0 or abook.abook_flags is null) + $sql_extra3 $sql_extra $sql_nets" ); $_SESSION['loadtime'] = datetime_convert(); } -- cgit v1.2.3