diff options
| author | Mario Vavti <mario@mariovavti.com> | 2015-03-08 12:07:43 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2015-03-08 12:07:43 +0100 |
| commit | 5bf49dabc673dbb0180d16ea81435ecac874e5a3 (patch) | |
| tree | 1c0ec7591a2e18097202a51564746e68c27a6744 /mod | |
| parent | 488d5b871407d5be6e4c38692aa7134a1a0e9899 (diff) | |
| parent | 480dac1af2dd5ed5ba3105577559568237fe5d80 (diff) | |
| download | volse-hubzilla-5bf49dabc673dbb0180d16ea81435ecac874e5a3.tar.gz volse-hubzilla-5bf49dabc673dbb0180d16ea81435ecac874e5a3.tar.bz2 volse-hubzilla-5bf49dabc673dbb0180d16ea81435ecac874e5a3.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/dirsearch.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mod/dirsearch.php b/mod/dirsearch.php index e734423a6..b4154c1eb 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -12,6 +12,8 @@ function dirsearch_content(&$a) { $ret = array('success' => false); +// logger('request: ' . print_r($_REQUEST,true)); + $dirmode = intval(get_config('system','directory_mode')); @@ -119,7 +121,7 @@ function dirsearch_content(&$a) { $sql_extra .= dir_query_build($joiner,'xprof_keywords',$keywords); if($forums) - $sql_extra .= dir_flag_build(' AND ','xchan_flags',XCHAN_FLAGS_PUBFORUM, $forums); + $safesql .= dir_flag_build(' AND ','xchan_flags',XCHAN_FLAGS_PUBFORUM, $forums); // we only support an age range currently. You must set both agege @@ -165,9 +167,9 @@ function dirsearch_content(&$a) { } - $safesql = (($safe > 0) ? " and not ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " )>0 " : ''); + $safesql .= (($safe > 0) ? " and not ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " )>0 " : ''); if($safe < 0) - $safesql = " and ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " )>0 "; + $safesql .= " and ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " )>0 "; if($limit) $qlimit = " LIMIT $limit "; |