diff options
| author | Andrew Manning <tamanning@zoho.com> | 2015-11-20 21:57:10 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2015-11-20 21:57:10 -0500 |
| commit | fee85030933bd15788bde7c0e019803a27a55f84 (patch) | |
| tree | a2755c3dbd77b3210f2420a162a28030e3fc2865 /mod/network.php | |
| parent | 6083cd255990c82380a85029b3951160eb558ac9 (diff) | |
| parent | fabf7081d39481bb22ee27c4beaf96e5529168eb (diff) | |
| download | volse-hubzilla-fee85030933bd15788bde7c0e019803a27a55f84.tar.gz volse-hubzilla-fee85030933bd15788bde7c0e019803a27a55f84.tar.bz2 volse-hubzilla-fee85030933bd15788bde7c0e019803a27a55f84.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla into url-selected
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' ", |