From: Alexander Ebert Date: Thu, 15 Dec 2016 03:05:19 +0000 (+0100) Subject: Fixed handling of i18n cms pages as landing pages X-Git-Tag: 3.0.0_RC_1~4 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e6fac1cae9428760436179efc10cc7989c2d64b9;p=GitHub%2FWoltLab%2FWCF.git Fixed handling of i18n cms pages as landing pages --- diff --git a/wcfsetup/install/files/lib/system/request/ControllerMap.class.php b/wcfsetup/install/files/lib/system/request/ControllerMap.class.php index 72578d66c0..99f27da6d1 100644 --- a/wcfsetup/install/files/lib/system/request/ControllerMap.class.php +++ b/wcfsetup/install/files/lib/system/request/ControllerMap.class.php @@ -247,6 +247,10 @@ class ControllerMap extends SingletonFactory { return false; } else { + if ($matches['controller'] == $this->landingPages[$application][0] && isset($this->customUrls['lookup'][$application]['']) && $this->customUrls['lookup'][$application][''] !== $controller) { + return false; + } + $controller = $matches['controller']; } }