Bugfix: Removed test code.

[friendica.git] / mod / search.php

diff --git a/mod/search.php b/mod/search.php
index c7387c5165e768fdc548d4d9c2215d002456f3e1..00f379a75c19ac6aa995cf9d66090c8d640e4679 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -130,8 +130,8 @@ function search_content(&$a) {
        if($tag) {
                $sql_extra = "";
 
-               $sql_table = sprintf("`item` INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
-                                       dbesc(protect_sprintf($search)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG), intval(local_user()));
+               $sql_table = sprintf("`item` INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d) AS `term` ON `item`.`id` = `term`.`oid` ",
+                                       dbesc(protect_sprintf($search)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG));
 
                $sql_order = "`item`.`id`";
        } else {
@@ -141,7 +141,8 @@ function search_content(&$a) {
                        $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search))));
                }
                $sql_table = "`item`";
-               $sql_order = "`item`.`received`";
+               $sql_order = "`item`.`id`";
+               //$sql_order = "`item`.`received`";
        }
 
        // Here is the way permissions work in the search module...
@@ -171,7 +172,7 @@ function search_content(&$a) {
                }
        }
 
-       $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`, 
+       $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`,
@@ -182,7 +183,7 @@ function search_content(&$a) {
                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
+               $sql_extra GROUP BY `item`.`uri`
                ORDER BY $sql_order DESC LIMIT %d , %d ",
                intval(local_user()),
                intval($a->pager['start']),