aboutsummaryrefslogtreecommitdiffstats
path: root/mod/search.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-04-03 02:44:29 -0700
committerfriendica <info@friendica.com>2012-04-03 02:44:29 -0700
commit4b762ff923626addc10e3b90c6fef183320c84ea (patch)
tree67cb6d81b21949fe04e8da9f07eb63620f1845e2 /mod/search.php
parent5d0d9f877294258cb90e1c496b4db750ee99f3ca (diff)
downloadvolse-hubzilla-4b762ff923626addc10e3b90c6fef183320c84ea.tar.gz
volse-hubzilla-4b762ff923626addc10e3b90c6fef183320c84ea.tar.bz2
volse-hubzilla-4b762ff923626addc10e3b90c6fef183320c84ea.zip
suppress duplicates in search
Diffstat (limited to 'mod/search.php')
-rwxr-xr-xmod/search.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/mod/search.php b/mod/search.php
index 6495fc8e5..4ca7db9bb 100755
--- a/mod/search.php
+++ b/mod/search.php
@@ -97,27 +97,26 @@ function search_content(&$a) {
// OR your own posts if you are a logged in member
// No items will be shown if the member has a blocked profile wall.
- $r = q("SELECT COUNT(*) AS `total`
+ $r = q("SELECT distinct(`item`.`uri`) as `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
AND (( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0)
OR `item`.`uid` = %d )
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
- AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' )",
+ AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' ) group by `item`.`uri` ",
intval(local_user()),
dbesc(preg_quote($search)),
dbesc('\\]' . preg_quote($search) . '\\[')
);
if(count($r))
- $a->set_pager_total($r[0]['total']);
-
- if(! $r[0]['total']) {
+ $a->set_pager_total(count($r));
+ if(! count($r)) {
info( t('No results.') . EOL);
return $o;
}
- $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
+ $r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
@@ -128,7 +127,8 @@ function search_content(&$a) {
AND (( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0 )
OR `item`.`uid` = %d )
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
- AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' )
+ AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' )
+ group by `item`.`uri`
ORDER BY `received` DESC LIMIT %d , %d ",
intval(local_user()),
dbesc(preg_quote($search)),