From f9a440759dcf65edd108046b53babde404853ee8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Thu, 23 Jun 2022 14:15:50 +0200 Subject: [PATCH] Inline DynamicRequestRoute::getControllerName() --- .../route/DynamicRequestRoute.class.php | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/wcfsetup/install/files/lib/system/request/route/DynamicRequestRoute.class.php b/wcfsetup/install/files/lib/system/request/route/DynamicRequestRoute.class.php index 0f10a3732d..0220c58ef7 100644 --- a/wcfsetup/install/files/lib/system/request/route/DynamicRequestRoute.class.php +++ b/wcfsetup/install/files/lib/system/request/route/DynamicRequestRoute.class.php @@ -208,7 +208,11 @@ class DynamicRequestRoute implements IRequestRoute // handle controller names if ($value === 'controller') { - $components[$value] = $this->getControllerName($application, $components[$value]); + $components[$value] = ControllerMap::getInstance()->lookup( + $application, + $components[$value], + !$this->isACP() + ); } $link .= $components[$value]; @@ -299,16 +303,4 @@ class DynamicRequestRoute implements IRequestRoute return false; } - - /** - * Returns the transformed controller name. - * - * @param string $application - * @param string $controller - * @return string - */ - protected function getControllerName($application, $controller) - { - return ControllerMap::getInstance()->lookup($application, $controller, !$this->isACP()); - } } -- 2.20.1