From 5c0e8c62de7f8dca27f2dcd571c94a5831cb0730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Thu, 30 Jun 2022 14:49:51 +0200 Subject: [PATCH] Changes - renamed Widget::accounttypes() to Widget::accountTypes() - fixed type-hint the documentation was wrong --- src/Content/Widget.php | 4 ++-- src/Module/Contact.php | 2 +- src/Module/Contact/Contacts.php | 2 +- src/Module/Conversation/Community.php | 2 +- src/Module/Conversation/Network.php | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Content/Widget.php b/src/Content/Widget.php index 9295818113..fba027680c 100644 --- a/src/Content/Widget.php +++ b/src/Content/Widget.php @@ -512,10 +512,10 @@ class Widget * The account type value is added as a parameter to the url * * @param string $base Basepath - * @param int $accounttype Acount type + * @param string $accounttype Account type * @return string */ - public static function accounttypes(string $base, int $accounttype): string + public static function accountTypes(string $base, string $accounttype): string { $accounts = [ ['ref' => 'person', 'name' => DI::l10n()->t('Persons')], diff --git a/src/Module/Contact.php b/src/Module/Contact.php index c7b2870ece..ccc61d3438 100644 --- a/src/Module/Contact.php +++ b/src/Module/Contact.php @@ -186,7 +186,7 @@ class Contact extends BaseModule $follow_widget = Widget::follow(); } - $account_widget = Widget::accounttypes($_SERVER['REQUEST_URI'], $accounttype); + $account_widget = Widget::accountTypes($_SERVER['REQUEST_URI'], $accounttype); $networks_widget = Widget::networks($_SERVER['REQUEST_URI'], $nets); $rel_widget = Widget::contactRels($_SERVER['REQUEST_URI'], $rel); $groups_widget = Widget::groups($_SERVER['REQUEST_URI'], $group); diff --git a/src/Module/Contact/Contacts.php b/src/Module/Contact/Contacts.php index 65fb5a43ea..e26811001f 100644 --- a/src/Module/Contact/Contacts.php +++ b/src/Module/Contact/Contacts.php @@ -141,7 +141,7 @@ class Contacts extends BaseModule '$paginate' => $pager->renderFull($total), ]); - DI::page()['aside'] .= Widget::accounttypes($_SERVER['REQUEST_URI'], $accounttype); + DI::page()['aside'] .= Widget::accountTypes($_SERVER['REQUEST_URI'], $accounttype); return $o; } diff --git a/src/Module/Conversation/Community.php b/src/Module/Conversation/Community.php index 877bed3e22..16e0f38afd 100644 --- a/src/Module/Conversation/Community.php +++ b/src/Module/Conversation/Community.php @@ -90,7 +90,7 @@ class Community extends BaseModule Nav::setSelected('community'); - DI::page()['aside'] .= Widget::accounttypes('community/' . self::$content, self::$accountTypeString); + DI::page()['aside'] .= Widget::accountTypes('community/' . self::$content, self::$accountTypeString); if (local_user() && DI::config()->get('system', 'community_no_sharer')) { $path = self::$content; diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php index 701d5371f0..6c133b69e4 100644 --- a/src/Module/Conversation/Network.php +++ b/src/Module/Conversation/Network.php @@ -86,7 +86,7 @@ class Network extends BaseModule $module = 'network'; - DI::page()['aside'] .= Widget::accounttypes($module, self::$accountTypeString); + DI::page()['aside'] .= Widget::accountTypes($module, self::$accountTypeString); DI::page()['aside'] .= Group::sidebarWidget($module, $module . '/group', 'standard', self::$groupId); DI::page()['aside'] .= ForumManager::widget($module . '/forum', local_user(), self::$forumContactId); DI::page()['aside'] .= Widget::postedByYear($module . '/archive', local_user(), false);