diff --git a/src/Module/HoverCard.php b/src/Module/HoverCard.php index 4c035d521..210680922 100644 --- a/src/Module/HoverCard.php +++ b/src/Module/HoverCard.php @@ -20,21 +20,16 @@ class HoverCard extends BaseModule { public static function rawContent(array $parameters = []) { - /** @var Arguments $args */ - $args = self::getClass(Arguments::class); - $a = self::getApp(); - // A logged in user views a profile of a user - if ((local_user()) && $args->get(2) === 'view') { + if ((local_user()) && ($parameters['action'] ?? '') === 'view') { + // A logged in user views a profile of a user $nickname = $a->user['nickname']; $profile = $parameters['profile']; - + } elseif (empty($parameters['action'])) { // Show the profile hovercard - } elseif ($args->getArgc() == 2) { $nickname = $parameters['profile']; $profile = 0; - } else { /** @var L10n $l10n */ $l10n = self::getClass(L10n::class); diff --git a/static/routes.config.php b/static/routes.config.php index ce2cf60c4..f15ec97a2 100644 --- a/static/routes.config.php +++ b/static/routes.config.php @@ -139,12 +139,12 @@ return [ '/{group:\d+}/add/{contact:\d+}' => [Module\Group::class, [R::GET, R::POST]], '/{group:\d+}/remove/{contact:\d+}' => [Module\Group::class, [R::GET, R::POST]], ], - '/hashtag' => [Module\Hashtag::class, [R::GET]], - '/help[/{doc:.+}]' => [Module\Help::class, [R::GET]], - '/home' => [Module\Home::class, [R::GET]], - '/hcard/{profile}[/{view}]' => [Module\HoverCard::class, [R::GET]], - '/inbox[/{nickname}]' => [Module\Inbox::class, [R::GET, R::POST]], - '/invite' => [Module\Invite::class, [R::GET, R::POST]], + '/hashtag' => [Module\Hashtag::class, [R::GET]], + '/help[/{doc:.+}]' => [Module\Help::class, [R::GET]], + '/home' => [Module\Home::class, [R::GET]], + '/hcard/{profile}[/{action}]' => [Module\HoverCard::class, [R::GET]], + '/inbox[/{nickname}]' => [Module\Inbox::class, [R::GET, R::POST]], + '/invite' => [Module\Invite::class, [R::GET, R::POST]], '/install' => [ '[/]' => [Module\Install::class, [R::GET, R::POST]],