Merge pull request #10987 from annando/api4

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

diff --git a/src/Module/Profile/Contacts.php b/src/Module/Profile/Contacts.php
index 3307694e7f8fed52a0c4b86785a00db7b41091c4..e20fd3f2d5451d0628c7694975b3d16d6cd567be 100644 (file)
--- a/src/Module/Profile/Contacts.php
+++ b/src/Module/Profile/Contacts.php
@@ -23,7 +23,6 @@ namespace Friendica\Module\Profile;
 
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
-use Friendica\Content\Widget;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
@@ -35,7 +34,7 @@ use Friendica\Network\HTTPException;
 
 class Contacts extends Module\BaseProfile
 {
-       public static function content(array $parameters = [])
+       public function content(): string
        {
                if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
                        throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
@@ -43,8 +42,8 @@ class Contacts extends Module\BaseProfile
 
                $a = DI::app();
 
-               $nickname = $parameters['nickname'];
-               $type = $parameters['type'] ?? 'all';
+               $nickname = $this->parameters['nickname'];
+               $type = $this->parameters['type'] ?? 'all';
 
                $profile = Model\Profile::load($a, $nickname);
                if (empty($profile)) {
@@ -53,13 +52,13 @@ class Contacts extends Module\BaseProfile
 
                $is_owner = $profile['uid'] == local_user();
 
-               if (!empty($profile['hide-friends']) && !$is_owner) {
+               if ($profile['hide-friends'] && !$is_owner) {
                        throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
                }
 
                Nav::setSelected('home');
 
-               $o = self::getTabsHTML($a, 'contacts', $is_owner, $profile);
+               $o = self::getTabsHTML($a, 'contacts', $is_owner, $profile['nickname'], $profile['hide-friends']);
 
                $tabs = self::getContactFilterTabs('profile/' . $nickname, $type, Session::isAuthenticated() && $profile['uid'] != local_user());