From 8f570f147b07407b5a46751dc7504820fba96005 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 5 Jul 2014 01:21:29 -0700 Subject: remove cyclic dependency on XCHAN_FLAGS_HIDDEN --- mod/zfinger.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'mod/zfinger.php') diff --git a/mod/zfinger.php b/mod/zfinger.php index d79025885..bd1463591 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -105,9 +105,11 @@ function zfinger_init(&$a) { $searchable = (($e['channel_pageflags'] & PAGE_HIDDEN) ? false : true); $deleted = (($e['xchan_flags'] & XCHAN_FLAGS_DELETED) ? true : false); - if(($e['xchan_flags'] & XCHAN_FLAGS_HIDDEN) || $deleted || $censored) + if($deleted || $censored) $searchable = false; + + // This is for birthdays and keywords, but must check access permissions $p = q("select * from profile where uid = %d and is_default = 1", intval($e['channel_id']) @@ -252,7 +254,6 @@ function zfinger_init(&$a) { $register_policy = intval(get_config('system','register_policy')); - if($register_policy == REGISTER_CLOSED) $ret['site']['register_policy'] = 'closed'; if($register_policy == REGISTER_APPROVE) -- cgit v1.2.3