Use DI::baseUrl() for Search\Index.php

diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php
index c53c6439c90aeab42c95b66f1347bd5aa54cf4cc..87f0193c328453c0f1c6607d7d45bee3bbb6d6a7 100644 (file)
--- a/src/Module/Search/Index.php
+++ b/src/Module/Search/Index.php
@@ -40,9 +40,6 @@ class Index extends BaseSearchModule
                        throw $e;
                }
 
-               /** @var BaseURL $baseURL */
-               $baseURL = self::getClass(BaseURL::class);
-
                if (Config::get('system', 'permit_crawling') && !Session::isAuthenticated()) {
                        // Default values:
                        // 10 requests are "free", after the 11th only a call per minute is allowed
@@ -97,13 +94,13 @@ class Index extends BaseSearchModule
                        $search = substr($search, 1);
                }
 
-               self::tryRedirectToProfile($baseURL, $search);
+               self::tryRedirectToProfile($search);
 
                if (strpos($search, '@') === 0 || strpos($search, '!') === 0) {
                        return self::performContactSearch($search);
                }
 
-               self::tryRedirectToPost($baseURL, $search);
+               self::tryRedirectToPost($search);
 
                if (!empty($_GET['search-option'])) {
                        switch ($_GET['search-option']) {
@@ -207,12 +204,11 @@ class Index extends BaseSearchModule
         * - user@domain
         * - Any fully-formed URL
         *
-        * @param BaseURL $baseURL
         * @param string  $search
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       private static function tryRedirectToProfile(BaseURL $baseURL, string $search)
+       private static function tryRedirectToProfile(string $search)
        {
                $isUrl = !empty(parse_url($search, PHP_URL_SCHEME));
                $isAddr = (bool)preg_match('/^@?([a-z0-9.-_]+@[a-z0-9.-_:]+)$/i', trim($search), $matches);
@@ -246,18 +242,17 @@ class Index extends BaseSearchModule
                }
 
                if (!empty($contact_id)) {
-                       $baseURL->redirect('contact/' . $contact_id);
+                       DI::baseUrl()->redirect('contact/' . $contact_id);
                }
        }
 
        /**
         * Fetch/search a post by URL and redirects to its local representation if it was found.
         *
-        * @param BaseURL $baseURL
         * @param string  $search
         * @throws HTTPException\InternalServerErrorException
         */
-       private static function tryRedirectToPost(BaseURL $baseURL, string $search)
+       private static function tryRedirectToPost(string $search)
        {
                if (parse_url($search, PHP_URL_SCHEME) == '') {
                        return;
@@ -278,7 +273,7 @@ class Index extends BaseSearchModule
                if (!empty($item_id)) {
                        $item = Item::selectFirst(['guid'], ['id' => $item_id]);
                        if (DBA::isResult($item)) {
-                               $baseURL->redirect('display/' . $item['guid']);
+                               DI::baseUrl()->redirect('display/' . $item['guid']);
                        }
                }
        }