Merge branch 'pull'

[friendica.git] / mod / search.php

diff --git a/mod/search.php b/mod/search.php
index bb33fb11d2f8c754c313a52dcba6c7565809d746..88ff9bbb73d57db751f067f263cedb6fe317a6f9 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -48,9 +48,9 @@ function search_content(&$a) {
                $search_alg = $s_regx;
 
        $r = q("SELECT COUNT(*) AS `total`
-               FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+               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 (( `wall` = 1 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' ) 
+               AND (( `wall` = 1 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `user`.`hidewall` = 0) 
                        OR `item`.`uid` = %d )
                AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
                $search_alg ",
@@ -72,15 +72,18 @@ function search_content(&$a) {
                `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
                `user`.`nickname`
                FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-               LEFT JOIN `user` ON `user`.`uid` = `item`.`uid` 
+               LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
                WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0
-               AND (( `wall` = 1 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' ) 
+               AND (( `wall` = 1 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `user`.`hidewall` = 0 ) 
                        OR `item`.`uid` = %d )
                AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
                $search_alg
-               ORDER BY `parent` DESC ",
+               ORDER BY `received` DESC LIMIT %d , %d ",
                intval(local_user()),
-               dbesc($search)
+               dbesc($search),
+               intval($a->pager['start']),
+               intval($a->pager['itemspage'])
+
        );
 
 
@@ -88,6 +91,7 @@ function search_content(&$a) {
        $o .= conversation($a,$r,'search',false);
 
        $o .= paginate($a);
+       $o .= cc_license();
 
        return $o;
 }