mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 17:35:12 +00:00
Merge https://github.com/friendica/red into zpull
This commit is contained in:
commit
320a8a5e27
2 changed files with 5 additions and 2 deletions
|
@ -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) {
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue