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

[friendica.git] / src / Module / Profile.php

diff --git a/src/Module/Profile.php b/src/Module/Profile.php
index eb8becfff5d9f0da3b1eeb57e3fde8c524a6e311..8232282dfd56e5fe725c5cc2fbe7644cffbb7d1b 100644 (file)
--- a/src/Module/Profile.php
+++ b/src/Module/Profile.php
@@ -120,7 +120,7 @@ class Profile extends BaseModule
                        $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . self::$which . '/" title="' . L10n::t('%s\'s posts', $a->profile['username']) . '"/>' . "\n";
                        $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . self::$which . '/comments" title="' . L10n::t('%s\'s comments', $a->profile['username']) . '"/>' . "\n";
                        $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . self::$which . '/activity" title="' . L10n::t('%s\'s timeline', $a->profile['username']) . '"/>' . "\n";
-                       $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->getHostName() . ($a->getURLPath() ? '/' . $a->getURLPath() : ''));
+                       $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . DI::baseUrl()->getHostname() . (DI::baseUrl()->getUrlPath() ? '/' . DI::baseUrl()->getUrlPath() : ''));
                        $a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . System::baseUrl() . '/xrd/?uri=' . $uri . '" />' . "\n";
                        header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
 
@@ -133,12 +133,9 @@ class Profile extends BaseModule
 
                $category = $datequery = $datequery2 = '';
 
-               /** @var DateTimeFormat $dtFormat */
-               $dtFormat = self::getClass(DateTimeFormat::class);
-
                if ($a->argc > 2) {
                        for ($x = 2; $x < $a->argc; $x ++) {
-                               if ($dtFormat->isYearMonth($a->argv[$x])) {
+                               if (DI::dtFormat()->isYearMonth($a->argv[$x])) {
                                        if ($datequery) {
                                                $datequery2 = Strings::escapeHtml($a->argv[$x]);
                                        } else {
@@ -261,7 +258,7 @@ class Profile extends BaseModule
                                return '';
                        }
 
-                       $pager = new Pager($a->query_string);
+                       $pager = new Pager(DI::args()->getQueryString());
                } else {
                        $sql_post_table = "";
 
@@ -293,7 +290,7 @@ class Profile extends BaseModule
 
                        //  check if we serve a mobile device and get the user settings
                        //  accordingly
-                       if ($a->is_mobile) {
+                       if (DI::mode()->isMobile()) {
                                $itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_mobile_network', 10);
                        } else {
                                $itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_network', 20);
@@ -305,7 +302,7 @@ class Profile extends BaseModule
                                $itemspage_network = $a->force_max_items;
                        }
 
-                       $pager = new Pager($a->query_string, $itemspage_network);
+                       $pager = new Pager(DI::args()->getQueryString(), $itemspage_network);
 
                        $pager_sql = sprintf(" LIMIT %d, %d ", $pager->getStart(), $pager->getItemsPerPage());