Fix the version sorting in the federation statistics

[friendica.git] / mod / search.php

diff --git a/mod/search.php b/mod/search.php
index fe290ee6d80671d90a677b6f8daf73becd21594a..be0f943d07c4a7e830089213a26588e308eacaed 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -11,7 +11,6 @@ use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 
-require_once "include/bbcode.php";
 require_once 'include/security.php';
 require_once 'include/conversation.php';
 require_once 'mod/dirfind.php';
@@ -19,6 +18,7 @@ require_once 'mod/dirfind.php';
 function search_saved_searches() {
 
        $o = '';
+       $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
        if (! Feature::isEnabled(local_user(),'savedsearch'))
                return $o;
@@ -146,11 +146,11 @@ function search_content(App $a) {
        $tag = false;
        if (x($_GET,'tag')) {
                $tag = true;
-               $search = ((x($_GET,'tag')) ? notags(trim(rawurldecode($_GET['tag']))) : '');
+               $search = (x($_GET,'tag') ? '#' . notags(trim(rawurldecode($_GET['tag']))) : '');
        }
 
        // contruct a wrapper for the search header
-       $o .= replace_macros(get_markup_template("content_wrapper.tpl"),[
+       $o = replace_macros(get_markup_template("content_wrapper.tpl"),[
                'name' => "search-header",
                '$title' => L10n::t("Search"),
                '$title_size' => 3,
@@ -202,6 +202,7 @@ function search_content(App $a) {
                                STRAIGHT_JOIN `item` ON `item`.`id`=`term`.`oid` %s
                        WHERE %s AND (`term`.`uid` = 0 OR (`term`.`uid` = %d AND NOT `term`.`global`))
                                AND `term`.`otype` = %d AND `term`.`type` = %d AND `term`.`term` = '%s' AND `item`.`verb` = '%s'
+                               AND NOT `author`.`blocked` AND NOT `author`.`hidden`
                        ORDER BY term.created DESC LIMIT %d , %d ",
                                item_fieldlists(), item_joins(), item_condition(),
                                intval(local_user()),
@@ -215,6 +216,7 @@ function search_content(App $a) {
                $r = q("SELECT %s
                        FROM `item` %s
                        WHERE %s AND (`item`.`uid` = 0 OR (`item`.`uid` = %s AND NOT `item`.`global`))
+                               AND NOT `author`.`blocked` AND NOT `author`.`hidden`
                                $sql_extra
                        GROUP BY `item`.`uri`, `item`.`id` ORDER BY `item`.`id` DESC LIMIT %d , %d",
                                item_fieldlists(), item_joins(), item_condition(),