From d7039b1c5c01b19e1421e957d9d48e6363d7049c Mon Sep 17 00:00:00 2001 From: Eliseu Amaro Date: Mon, 17 Jan 2022 21:33:38 +0000 Subject: [PATCH] [COMPONENTS][Group] Create a group route added, template polished [COMPONENTS][Circle] Removed any Group related route from shouldAddToRightPanel event [CARDS][Profile] Block should now allow inline long nicknames to not break --- components/Group/Controller/Group.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/components/Group/Controller/Group.php b/components/Group/Controller/Group.php index 6b080ae3d4..374a86c261 100644 --- a/components/Group/Controller/Group.php +++ b/components/Group/Controller/Group.php @@ -218,13 +218,14 @@ class Group extends FeedController */ public function groupSettings(Request $request, string $nickname) { - $group = LocalGroup::getActorByNickname($nickname); - $actor = Common::actor(); - if (!\is_null($group) && $actor->canAdmin($group)) { + $local_group = LocalGroup::getByNickname($nickname); + $group_actor = $local_group->getActor(); + $actor = Common::actor(); + if (!\is_null($group_actor) && $actor->canAdmin($group_actor)) { return [ '_template' => 'group/settings.html.twig', - 'group' => $group, - 'personal_info_form' => ActorForms::personalInfo($request, $actor, $group)->createView(), + 'group' => $group_actor, + 'personal_info_form' => ActorForms::personalInfo($request, $actor, $local_group)->createView(), 'open_details_query' => $this->string('open'), ]; } else {