diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-20 19:51:57 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-20 19:51:57 +0100 |
| commit | 90187eae37ecdee56d245f563f529638ea8f55da (patch) | |
| tree | 5f06f71871ab8df3281b50c5d3c36d640498c672 /mod/network.php | |
| parent | 3b7b3ef2bb8dce373d2184309958e790a0478371 (diff) | |
| parent | 7399f7a087b56e2f09419dc8ff99fc5ce15fa195 (diff) | |
| download | volse-hubzilla-90187eae37ecdee56d245f563f529638ea8f55da.tar.gz volse-hubzilla-90187eae37ecdee56d245f563f529638ea8f55da.tar.bz2 volse-hubzilla-90187eae37ecdee56d245f563f529638ea8f55da.zip | |
Merge remote-tracking branch 'upstream/master'
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' ", |