Merge pull request #4579 from annando/fix-diaspora-link

[friendica.git] / mod / search.php

diff --git a/mod/search.php b/mod/search.php
index f1f10addbd5c418f1f4d6c607e95691ba8334b01..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,