From f5a17e4ce5eafa61bdb98c1c5a1a7356524f164f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Mon, 27 Jun 2022 17:00:37 +0200 Subject: [PATCH] Delegate to ->classNameToControllerName() in RoutingCacheBuilder::getCaseInsensitiveControllers() --- .../lib/system/cache/builder/RoutingCacheBuilder.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wcfsetup/install/files/lib/system/cache/builder/RoutingCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/RoutingCacheBuilder.class.php index 16619e646b..42a1329428 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/RoutingCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/RoutingCacheBuilder.class.php @@ -150,12 +150,12 @@ class RoutingCacheBuilder extends AbstractCacheBuilder // search for files with two consecutive upper-case letters but ignore interfaces such as `IPage` if (!\preg_match('~^I[A-Z][a-z]~', $filename) && \preg_match('~[A-Z]{2,}~', $filename)) { + $className = $abbreviation . '\\' . ($libDirectory === 'lib/acp' ? 'acp\\' : '') . $pageType . '\\' . $filename; + $ciController = ControllerMap::transformController( - \preg_replace('/(Action|Form|Page)$/', '', $filename) + $this->classNameToControllerName($className) ); - $className = $abbreviation . '\\' . ($libDirectory === 'lib/acp' ? 'acp\\' : '') . $pageType . '\\' . $filename; - $data[$abbreviation][$libDirectory === 'lib' ? 'frontend' : 'acp'][$ciController] = $className; } } -- 2.20.1