Merge pull request #7095 from annando/ap-connect

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

diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 51cee03bf84a7ab5e03a7da10095e46f1135a85e..a63244e856a7ffd0d2b0843750f72552ae7a682a 100644 (file)
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -11,8 +11,8 @@ use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\Model\Contact;
 use Friendica\Model\Profile;
+use Friendica\Model\User;
 
 class Nav
 {
@@ -67,7 +67,6 @@ class Nav
                $tpl = Renderer::getMarkupTemplate('nav.tpl');
 
                $nav .= Renderer::replaceMacros($tpl, [
-                       '$baseurl'      => System::baseUrl(),
                        '$sitelocation' => $nav_info['sitelocation'],
                        '$nav'          => $nav_info['nav'],
                        '$banner'       => $nav_info['banner'],
@@ -180,7 +179,7 @@ class Nav
                        $nav['home'] = [$homelink, L10n::t('Home'), '', L10n::t('Home Page')];
                }
 
-               if (intval(Config::get('config', 'register_policy')) === REGISTER_OPEN && !local_user() && !remote_user()) {
+               if (intval(Config::get('config', 'register_policy')) === \Friendica\Module\Register::OPEN && !local_user() && !remote_user()) {
                        $nav['register'] = ['register', L10n::t('Register'), '', L10n::t('Create an account')];
                }
 
@@ -242,7 +241,7 @@ class Nav
                        $nav['home'] = ['profile/' . $a->user['nickname'], L10n::t('Home'), '', L10n::t('Your posts and conversations')];
 
                        // Don't show notifications for public communities
-                       if (defaults($_SESSION, 'page_flags', '') != Contact::PAGE_COMMUNITY) {
+                       if (defaults($_SESSION, 'page_flags', '') != User::PAGE_FLAGS_COMMUNITY) {
                                $nav['introductions'] = ['notifications/intros', L10n::t('Introductions'), '', L10n::t('Friend Requests')];
                                $nav['notifications'] = ['notifications',       L10n::t('Notifications'), '', L10n::t('Notifications')];
                                $nav['notifications']['all'] = ['notifications/system', L10n::t('See all notifications'), '', ''];