convert the abook fields

1 files changed, 4 insertions, 6 deletions

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();
 		}