harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove cyclic dependency on XCHAN_FLAGS_HIDDEN

Browse Source
This commit is contained in:
friendica 2014-07-05 01:21:29 -07:00
parent ee3a4902de
commit 8f570f147b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mod/zfinger.php
View File

@ -105,9 +105,11 @@ function zfinger_init(&$a) {
$searchable = (($e['channel_pageflags'] & PAGE_HIDDEN) ? false : true); $searchable = (($e['channel_pageflags'] & PAGE_HIDDEN) ? false : true);
$deleted = (($e['xchan_flags'] & XCHAN_FLAGS_DELETED) ? true : false); $deleted = (($e['xchan_flags'] & XCHAN_FLAGS_DELETED) ? true : false);
if(($e['xchan_flags'] & XCHAN_FLAGS_HIDDEN) || $deleted || $censored) if($deleted || $censored)
$searchable = false; $searchable = false;
// This is for birthdays and keywords, but must check access permissions // This is for birthdays and keywords, but must check access permissions
$p = q("select * from profile where uid = %d and is_default = 1", $p = q("select * from profile where uid = %d and is_default = 1",
intval($e['channel_id']) intval($e['channel_id'])
@ -252,7 +254,6 @@ function zfinger_init(&$a) {
$register_policy = intval(get_config('system','register_policy')); $register_policy = intval(get_config('system','register_policy'));
if($register_policy == REGISTER_CLOSED) if($register_policy == REGISTER_CLOSED)
$ret['site']['register_policy'] = 'closed'; $ret['site']['register_policy'] = 'closed';
if($register_policy == REGISTER_APPROVE) if($register_policy == REGISTER_APPROVE)

2
version.inc
View File

@ -1 +1 @@
2014-07-04.726 2014-07-05.727