Saved searches now can search for tags as well
This commit is contained in:
parent
a612b10b2a
commit
a5dc41ab13
|
@ -402,11 +402,23 @@ function network_content(&$a, $update = 0) {
|
||||||
|
|
||||||
if(x($_GET,'search')) {
|
if(x($_GET,'search')) {
|
||||||
$search = escape_tags($_GET['search']);
|
$search = escape_tags($_GET['search']);
|
||||||
|
if (get_config('system','use_fulltext_engine')) {
|
||||||
|
if(strpos($search,'#') === 0)
|
||||||
|
$sql_extra .= sprintf(" AND (MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode)) ",
|
||||||
|
dbesc(protect_sprintf($search))
|
||||||
|
);
|
||||||
|
else
|
||||||
|
$sql_extra .= sprintf(" AND (MATCH(`item`.`body`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode)) ",
|
||||||
|
dbesc(protect_sprintf($search)),
|
||||||
|
dbesc(protect_sprintf($search))
|
||||||
|
);
|
||||||
|
} else {
|
||||||
$sql_extra .= sprintf(" AND ( `item`.`body` like '%s' OR `item`.`tag` like '%s' ) ",
|
$sql_extra .= sprintf(" AND ( `item`.`body` like '%s' OR `item`.`tag` like '%s' ) ",
|
||||||
dbesc(protect_sprintf('%' . $search . '%')),
|
dbesc(protect_sprintf('%' . $search . '%')),
|
||||||
dbesc(protect_sprintf('%]' . $search . '[%'))
|
dbesc(protect_sprintf('%]' . $search . '[%'))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if(strlen($file)) {
|
if(strlen($file)) {
|
||||||
$sql_extra .= file_tag_file_query('item',unxmlify($file));
|
$sql_extra .= file_tag_file_query('item',unxmlify($file));
|
||||||
}
|
}
|
||||||
|
|
|
@ -96,7 +96,6 @@ function search_content(&$a) {
|
||||||
|
|
||||||
$o .= search($search,'search-box','/search',((local_user()) ? true : false));
|
$o .= search($search,'search-box','/search',((local_user()) ? true : false));
|
||||||
|
|
||||||
|
|
||||||
if(strpos($search,'#') === 0) {
|
if(strpos($search,'#') === 0) {
|
||||||
$tag = true;
|
$tag = true;
|
||||||
$search = substr($search,1);
|
$search = substr($search,1);
|
||||||
|
|
Loading…
Reference in a new issue