Merge pull request #8139 from MrPetovan/bug/notices

[friendica.git] / src / Content / Nav.php

diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 3594bae50ef086a07e914e325940a0d54eccf54a..2cb47710295c2dba9353fffc2033f12695d2cfda 100644 (file)
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -10,7 +10,6 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Profile;
@@ -120,7 +119,6 @@ class Nav
        /**
         * Prepares a list of navigation links
         *
-        * @brief Prepares a list of navigation links
         * @param  App   $a
         * @return array Navigation links
         *    string 'sitelocation' => The webbie (username@site.com)
@@ -141,7 +139,7 @@ class Nav
 
                $myident = ((is_array($a->user) && isset($a->user['nickname'])) ? $a->user['nickname'] . '@' : '');
 
-               $sitelocation = $myident . substr(System::baseUrl($ssl_state), strpos(System::baseUrl($ssl_state), '//') + 2);
+               $sitelocation = $myident . substr(DI::baseUrl()->get($ssl_state), strpos(DI::baseUrl()->get($ssl_state), '//') + 2);
 
                // nav links: array of array('href', 'text', 'extra css classes', 'title')
                $nav = [];
@@ -240,7 +238,6 @@ class Nav
                // The following nav links are only show to logged in users
                if (local_user()) {
                        $nav['network'] = ['network', L10n::t('Network'), '', L10n::t('Conversations from your friends')];
-                       $nav['net_reset'] = ['network/?f=', L10n::t('Network Reset'), '', L10n::t('Load Network page with no filters')];
 
                        $nav['home'] = ['profile/' . $a->user['nickname'], L10n::t('Home'), '', L10n::t('Your posts and conversations')];