aboutsummaryrefslogtreecommitdiffstats
path: root/mod/search.php
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-20 19:51:57 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-20 19:51:57 +0100
commit90187eae37ecdee56d245f563f529638ea8f55da (patch)
tree5f06f71871ab8df3281b50c5d3c36d640498c672 /mod/search.php
parent3b7b3ef2bb8dce373d2184309958e790a0478371 (diff)
parent7399f7a087b56e2f09419dc8ff99fc5ce15fa195 (diff)
downloadvolse-hubzilla-90187eae37ecdee56d245f563f529638ea8f55da.tar.gz
volse-hubzilla-90187eae37ecdee56d245f563f529638ea8f55da.tar.bz2
volse-hubzilla-90187eae37ecdee56d245f563f529638ea8f55da.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/search.php')
-rw-r--r--mod/search.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/mod/search.php b/mod/search.php
index a0085fca9..555d46f6a 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -75,9 +75,10 @@ function search_content(&$a,$update = 0, $load = false) {
return $o;
if($tag) {
- $sql_extra = sprintf(" AND `item`.`id` IN (select `oid` from term where otype = %d and type = %d and term = '%s') ",
+ $sql_extra = sprintf(" AND `item`.`id` IN (select `oid` from term where otype = %d and type in ( %d , %d) and term = '%s') ",
intval(TERM_OBJ_POST),
intval(TERM_HASHTAG),
+ intval(TERM_COMMUNITYTAG),
dbesc(protect_sprintf($search))
);
}