X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsearch.php;h=790f577ba6e17511b6be30b39c3de963da5114a8;hb=fd8df4c4d6688e5ffd6bc78e14062aa064102715;hp=7c78339c70b1638c271f90dcef86caccfbc0bd3b;hpb=c00772204100a44267c38f7a2533268b5dff1248;p=friendica.git diff --git a/mod/search.php b/mod/search.php index 7c78339c70..790f577ba6 100644 --- a/mod/search.php +++ b/mod/search.php @@ -147,7 +147,7 @@ function search_content(&$a) { } - $o .= search($search,'search-box','/search',((local_user()) ? true : false), false); + $o .= search($search,'search-box','search',((local_user()) ? true : false), false); if(strpos($search,'#') === 0) { $tag = true; @@ -217,11 +217,10 @@ function search_content(&$a) { FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND NOT `contact`.`blocked` AND NOT `contact`.`pending` WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` - AND (`item`.`uid` = 0 OR (`item`.`uid` = %s AND (`item`.`private` OR NOT `item`.`network` IN ('%s', '%s', '%s')))) + AND (`item`.`uid` = 0 OR (`item`.`uid` = %s AND NOT `item`.`global`)) $sql_extra GROUP BY `item`.`uri` ORDER BY `item`.`id` DESC LIMIT %d , %d ", - intval(local_user()), dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA), - intval($a->pager['start']), intval($a->pager['itemspage'])); + intval(local_user()), intval($a->pager['start']), intval($a->pager['itemspage'])); } if(! count($r)) {