Just cleaning up the code.

[friendica.git] / mod / search.php

diff --git a/mod/search.php b/mod/search.php
index 3f17e7a7ae19683ab17c686fb821cc3f487fd16a..d3cf2b128679c2c79cd5147411ccee659805f0b0 100644 (file)
--- 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`,