1
0
Fork 0

loosen search restrictions

This commit is contained in:
Friendika 2010-11-08 21:10:53 -08:00
parent 1f4048067e
commit 9f606be540

View file

@ -27,10 +27,11 @@ function search_content(&$a) {
$r = q("SELECT COUNT(*) AS `total` $r = q("SELECT COUNT(*) AS `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0
AND `wall` = 1 AND ( `wall` = 1 OR `contact`.`uid` = %d )
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
AND MATCH (`item`.`body`) AGAINST ( '%s' IN BOOLEAN MODE ) AND MATCH (`item`.`body`) AGAINST ( '%s' IN BOOLEAN MODE )
$sql_extra ", $sql_extra ",
intval(local_user()),
dbesc($search) dbesc($search)
); );
@ -50,11 +51,12 @@ function search_content(&$a) {
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
LEFT JOIN `user` ON `user`.`uid` = `item`.`uid` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0
AND `wall` = 1 AND ( `wall` = 1 OR `contact`.`uid` = %d )
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
AND MATCH (`item`.`body`) AGAINST ( '%s' IN BOOLEAN MODE ) AND MATCH (`item`.`body`) AGAINST ( '%s' IN BOOLEAN MODE )
$sql_extra $sql_extra
ORDER BY `parent` DESC ", ORDER BY `parent` DESC ",
intval(local_user()),
dbesc($search) dbesc($search)
); );