Merge pull request #8900 from tobiasd/20200718-serverblocklistcsv

[friendica.git] / src / Module / Search / Index.php

diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php
index 0aba7a203d5422c544ab97bc499ec0653c991938..bf3ae2585b19de398b99ef90f2f9163aa8c35b4c 100644 (file)
--- a/src/Module/Search/Index.php
+++ b/src/Module/Search/Index.php
@@ -28,6 +28,7 @@ use Friendica\Content\Widget;
 use Friendica\Core\Cache\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
+use Friendica\Core\Search;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -80,7 +81,7 @@ class Index extends BaseSearch
                }
 
                if (local_user()) {
-                       DI::page()['aside'] .= Widget\SavedSearches::getHTML('search?q=' . urlencode($search), $search);
+                       DI::page()['aside'] .= Widget\SavedSearches::getHTML(Search::getSearchPath($search), $search);
                }
 
                Nav::setSelected('search');
@@ -149,7 +150,7 @@ class Index extends BaseSearch
 
                if ($tag) {
                        Logger::info('Start tag search.', ['q' => $search]);
-                       $uriids = Tag::getURIIdListForTag($search, local_user(), $pager->getStart(), $pager->getItemsPerPage());
+                       $uriids = Tag::getURIIdListByTag($search, local_user(), $pager->getStart(), $pager->getItemsPerPage());
 
                        if (!empty($uriids)) {
                                $params = ['order' => ['id' => true], 'group_by' => ['uri-id']];
@@ -175,7 +176,7 @@ class Index extends BaseSearch
                }
 
                if (!DBA::isResult($r)) {
-                       info(DI::l10n()->t('No results.'));
+                       notice(DI::l10n()->t('No results.'));
                        return $o;
                }
 
@@ -236,13 +237,13 @@ class Index extends BaseSearch
                } else {
                        // Cheaper local lookup for anonymous users, no probe
                        if ($isAddr) {
-                               $contact = Contact::selectFirst(['id' => 'cid'], ['addr' => $search, 'uid' => 0]);
+                               $contact = Contact::selectFirst(['id'], ['addr' => $search, 'uid' => 0]);
                        } else {
-                               $contact = Contact::getDetailsByURL($search, 0, ['cid' => 0]);
+                               $contact = Contact::getByURL($search, null, ['id']) ?: ['id' => 0];
                        }
 
                        if (DBA::isResult($contact)) {
-                               $contact_id = $contact['cid'];
+                               $contact_id = $contact['id'];
                        }
                }