From ff4b1b6c618ddf42fea0f165ea9dad2469bc8ca5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Wed, 1 Jun 2022 17:00:55 +0200 Subject: [PATCH] Remove dead branch in ControllerMap::isDefaultController() Since the previous changes it is impossible for an entry `''` to exist in the custom URL mapping, causing this branch to never be taken. This essentially reverts e6fac1cae9428760436179efc10cc7989c2d64b9. --- .../files/lib/system/request/ControllerMap.class.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/wcfsetup/install/files/lib/system/request/ControllerMap.class.php b/wcfsetup/install/files/lib/system/request/ControllerMap.class.php index f5f1aa70bb..8b58e68353 100644 --- a/wcfsetup/install/files/lib/system/request/ControllerMap.class.php +++ b/wcfsetup/install/files/lib/system/request/ControllerMap.class.php @@ -309,14 +309,6 @@ class ControllerMap extends SingletonFactory return false; } - if ( - $matches['controller'] == $this->landingPages[$application]['controller'] - && isset($this->customUrls['lookup'][$application]['']) - && $this->customUrls['lookup'][$application][''] !== $controller - ) { - return false; - } - $controller = $matches['controller']; } } -- 2.20.1