From 2a02e1cb9ce3306be22865417fa04b05571edd36 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 8 Feb 2015 20:55:48 +0100 Subject: [PATCH] Just cleaning up the code. --- mod/search.php | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/mod/search.php b/mod/search.php index 3f17e7a7a..d3cf2b128 100644 --- a/mod/search.php +++ b/mod/search.php @@ -151,18 +151,6 @@ function search_content(&$a) { // No items will be shown if the member has a blocked profile wall. if(get_config('system', 'old_pager')) { -/* - $r = q("SELECT distinct(`item`.`uri`) as `total` - FROM $sql_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - INNER 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 )) - $sql_extra ", - intval(local_user()) - ); -*/ $r = q("SELECT distinct(`item`.`uri`) as `total` FROM $sql_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 @@ -182,27 +170,6 @@ function search_content(&$a) { } } -/* - $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`, - `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`, - `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, - `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`, - `user`.`nickname`, `user`.`uid`, `user`.`hidewall` - FROM $sql_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - INNER 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)) - $sql_extra - GROUP BY `item`.`uri` - ORDER BY $sql_order DESC LIMIT %d , %d ", - intval(local_user()), - intval($a->pager['start']), - intval($a->pager['itemspage']) - - ); -*/ $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`, `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,