diff options
| author | mrjive <mrjive@mrjive.it> | 2015-12-04 10:32:14 +0100 |
|---|---|---|
| committer | mrjive <mrjive@mrjive.it> | 2015-12-04 10:32:14 +0100 |
| commit | 051346325609f5f2e78ef0deaf182c65d7823bbc (patch) | |
| tree | f3660377b3daf6599623d2e4fb95b4d33c30d8cc /mod/network.php | |
| parent | 53a796afcc0cff6f9e3f51457df4506a43db1945 (diff) | |
| parent | 8a9d743f6f518d3af35014130dcef8f148148113 (diff) | |
| download | volse-hubzilla-051346325609f5f2e78ef0deaf182c65d7823bbc.tar.gz volse-hubzilla-051346325609f5f2e78ef0deaf182c65d7823bbc.tar.bz2 volse-hubzilla-051346325609f5f2e78ef0deaf182c65d7823bbc.zip | |
Merge pull request #9 from redmatrix/master
updating from original codebase
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' ", |