Make \wcf\system\request\Request externally immutable

diff --git a/wcfsetup/install/files/lib/system/request/Request.class.php b/wcfsetup/install/files/lib/system/request/Request.class.php
index 772d2986b008516747ca1139b2ec0ae7104177d3..3f362cbce0568980c564109f945575e726567a20 100644 (file)
--- a/wcfsetup/install/files/lib/system/request/Request.class.php
+++ b/wcfsetup/install/files/lib/system/request/Request.class.php
@@ -53,18 +53,11 @@ final class Request implements RequestHandlerInterface
      * @param string $className fully qualified name
      * @param string[] $metaData additional meta data
      */
-    public function __construct($className, array $metaData)
+    public function __construct($className, array $metaData, bool $isLandingPage)
     {
         $this->className = $className;
         $this->metaData = $metaData;
-    }
-
-    /**
-     * Marks this request as landing page.
-     */
-    public function setIsLandingPage()
-    {
-        $this->isLandingPage = true;
+        $this->isLandingPage = $isLandingPage;
     }
 
     /**

diff --git a/wcfsetup/install/files/lib/system/request/RequestHandler.class.php b/wcfsetup/install/files/lib/system/request/RequestHandler.class.php
index 87d223da771847367570723580c3bc5e03add80c..2b38ac05d885aaef30956c1e2bc7a94fd693ab03 100644 (file)
--- a/wcfsetup/install/files/lib/system/request/RequestHandler.class.php
+++ b/wcfsetup/install/files/lib/system/request/RequestHandler.class.php
@@ -200,15 +200,9 @@ final class RequestHandler extends SingletonFactory
 
             $this->activeRequest = new Request(
                 $className,
-                $metaData
+                $metaData,
+                !$this->isACPRequest() && ControllerMap::getInstance()->isLandingPage($className, $metaData)
             );
-
-            if (!$this->isACPRequest()) {
-                // determine if current request matches the landing page
-                if (ControllerMap::getInstance()->isLandingPage($className, $metaData)) {
-                    $this->activeRequest->setIsLandingPage();
-                }
-            }
         } catch (SystemException $e) {
             if (
                 \defined('ENABLE_DEBUG_MODE')