From ba980e2c1f3d673ab07e6c3ac1c3657294f95708 Mon Sep 17 00:00:00 2001 From: Michael Johnston Date: Tue, 3 Sep 2013 23:58:46 -0400 Subject: filter by category fixes --- mod/channel.php | 5 ++++- view/tpl/build_query.tpl | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mod/channel.php b/mod/channel.php index aa158d330..5d3855269 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -90,6 +90,8 @@ function channel_content(&$a, $update = 0, $load = false) { require_once('include/permissions.php'); + $category = ((x($_REQUEST,'cat')) ? $_REQUEST['cat'] : ''); + $groups = array(); $o = ''; @@ -171,8 +173,9 @@ function channel_content(&$a, $update = 0, $load = false) { } else { + if(x($category)) { - $sql_extra .= protect_sprintf(file_tag_file_query('item',$category,'category')); + $sql_extra .= protect_sprintf(term_query('item', $category, TERM_CATEGORY)); } if($datequery) { diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl index e5bf3acce..53a8c0f6b 100755 --- a/view/tpl/build_query.tpl +++ b/view/tpl/build_query.tpl @@ -41,7 +41,7 @@ if(bParam_search != "") bCmd = bCmd + "&search=" + bParam_search; if(bParam_order != "") bCmd = bCmd + "&order=" + bParam_order; if(bParam_file != "") bCmd = bCmd + "&file=" + bParam_file; - if(bParam_cats != "") bCmd = bCmd + "&cats=" + bParam_cats; + if(bParam_cats != "") bCmd = bCmd + "&cat=" + bParam_cats; if(bParam_dend != "") bCmd = bCmd + "&dend=" + bParam_dend; if(bParam_dbegin != "") bCmd = bCmd + "&dbegin=" + bParam_dbegin; if(bParam_mid != "") bCmd = bCmd + "&mid=" + bParam_mid; -- cgit v1.2.3