aboutsummaryrefslogtreecommitdiffstats
path: root/mod/channel.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-12-15 14:37:31 -0800
committerfriendica <info@friendica.com>2014-12-15 14:37:31 -0800
commitf28103d595c0e02dfd30d44b3115915994e9ecc0 (patch)
treeb5076f4f5440738033d8d009799ff1d394250dbe /mod/channel.php
parent1780ba5e7d1571d82a6428c4907d6a264217c778 (diff)
downloadvolse-hubzilla-f28103d595c0e02dfd30d44b3115915994e9ecc0.tar.gz
volse-hubzilla-f28103d595c0e02dfd30d44b3115915994e9ecc0.tar.bz2
volse-hubzilla-f28103d595c0e02dfd30d44b3115915994e9ecc0.zip
wall tags
Diffstat (limited to 'mod/channel.php')
-rw-r--r--mod/channel.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/mod/channel.php b/mod/channel.php
index 54b25ad8b..f85f904aa 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -57,6 +57,7 @@ function channel_content(&$a, $update = 0, $load = false) {
}
$category = ((x($_REQUEST,'cat')) ? $_REQUEST['cat'] : '');
+ $hashtags = ((x($_REQUEST,'tag')) ? $_REQUEST['tag'] : '');
$groups = array();
@@ -174,6 +175,9 @@ function channel_content(&$a, $update = 0, $load = false) {
if(x($category)) {
$sql_extra .= protect_sprintf(term_query('item', $category, TERM_CATEGORY));
}
+ if(x($hashtags)) {
+ $sql_extra .= protect_sprintf(term_query('item', $hashtags, TERM_HASHTAG));
+ }
if($datequery) {
$sql_extra2 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery))));
@@ -281,6 +285,7 @@ function channel_content(&$a, $update = 0, $load = false) {
'$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0),
'$file' => '',
'$cats' => (($category) ? $category : ''),
+ '$tags' => (($hashtags) ? $hashtags : ''),
'$mid' => $mid,
'$dend' => $datequery,
'$dbegin' => $datequery2