aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-07 15:21:23 -0800
committerfriendica <info@friendica.com>2015-03-07 15:21:23 -0800
commitaac4affe656176f0538513435a4fdd8a69f244fc (patch)
tree10fe73a924e7bcbd9639be8e28c3f8060bba9d9a
parent53e908d7b7ea1b1ff9aa5ca6154dc4c9e7ca0d13 (diff)
downloadvolse-hubzilla-aac4affe656176f0538513435a4fdd8a69f244fc.tar.gz
volse-hubzilla-aac4affe656176f0538513435a4fdd8a69f244fc.tar.bz2
volse-hubzilla-aac4affe656176f0538513435a4fdd8a69f244fc.zip
directory: fix public forum listing
-rw-r--r--mod/dirsearch.php8
-rw-r--r--version.inc2
2 files changed, 6 insertions, 4 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 ";
diff --git a/version.inc b/version.inc
index 8780222d0..c4fb1b2d6 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-03-06.963
+2015-03-07.964