diff options
| author | friendica <info@friendica.com> | 2014-07-05 01:21:29 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-07-05 01:21:29 -0700 |
| commit | 8f570f147b07407b5a46751dc7504820fba96005 (patch) | |
| tree | 1a87665a6110703f6cbdcd39e4de11dc3e6046f4 | |
| parent | ee3a4902def794911157843c61f27add58092dc1 (diff) | |
| download | volse-hubzilla-8f570f147b07407b5a46751dc7504820fba96005.tar.gz volse-hubzilla-8f570f147b07407b5a46751dc7504820fba96005.tar.bz2 volse-hubzilla-8f570f147b07407b5a46751dc7504820fba96005.zip | |
remove cyclic dependency on XCHAN_FLAGS_HIDDEN
| -rw-r--r-- | mod/zfinger.php | 5 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 4 insertions, 3 deletions
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) diff --git a/version.inc b/version.inc index 6826f4ae0..0ecd5d881 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-07-04.726 +2014-07-05.727 |