diff options
| author | Wave <wave72@users.noreply.github.com> | 2015-11-25 09:39:44 +0100 |
|---|---|---|
| committer | Wave <wave72@users.noreply.github.com> | 2015-11-25 09:39:44 +0100 |
| commit | 2de65ab39fc704fd8b7abcf9003ee98e3ffb1cc3 (patch) | |
| tree | 783f90531c93f498609fb1dbd0e199ca65bb2cc0 /mod/network.php | |
| parent | e785b723aad51d4f7202dbbb24a0e2245428cb5b (diff) | |
| parent | 0559db9cf81267c34ca014fef1aebe1cf31de2ab (diff) | |
| download | volse-hubzilla-2de65ab39fc704fd8b7abcf9003ee98e3ffb1cc3.tar.gz volse-hubzilla-2de65ab39fc704fd8b7abcf9003ee98e3ffb1cc3.tar.bz2 volse-hubzilla-2de65ab39fc704fd8b7abcf9003ee98e3ffb1cc3.zip | |
Merge pull request #3 from redmatrix/master
Update branch
Diffstat (limited to 'mod/network.php')
| -rw-r--r-- | mod/network.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/network.php b/mod/network.php index 53de975a4..9f0604296 100644 --- a/mod/network.php +++ b/mod/network.php @@ -248,7 +248,7 @@ function network_content(&$a, $update = 0, $load = false) { $sql_extra .= protect_sprintf(term_query('item', $category, TERM_CATEGORY)); } if(x($hashtags)) { - $sql_extra .= protect_sprintf(term_query('item', $hashtags, TERM_HASHTAG)); + $sql_extra .= protect_sprintf(term_query('item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG)); } if(! $update) { @@ -313,7 +313,7 @@ function network_content(&$a, $update = 0, $load = false) { if(x($_GET,'search')) { $search = escape_tags($_GET['search']); if(strpos($search,'#') === 0) { - $sql_extra .= term_query('item',substr($search,1),TERM_HASHTAG); + $sql_extra .= term_query('item',substr($search,1),TERM_HASHTAG,TERM_COMMUNITYTAG); } else { $sql_extra .= sprintf(" AND item.body like '%s' ", |