From 81bd9f2c76d8494008f107c4341859c2186c63ff Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Wed, 11 May 2022 12:00:32 +0200 Subject: [PATCH] Make ApplicationHandler::isMultiDomainSetup() always return false see #4295 --- .../application/ApplicationHandler.class.php | 23 ++----------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php b/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php index 35737b9054..823a52c70b 100644 --- a/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php +++ b/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php @@ -11,7 +11,6 @@ use wcf\system\cache\builder\ApplicationCacheBuilder; use wcf\system\request\RequestHandler; use wcf\system\request\RouteHandler; use wcf\system\SingletonFactory; -use wcf\system\WCF; use wcf\util\ArrayUtil; use wcf\util\FileUtil; use wcf\util\StringUtil; @@ -33,12 +32,6 @@ class ApplicationHandler extends SingletonFactory */ protected $cache; - /** - * true for multi-domain setups - * @var bool - */ - protected $isMultiDomain; - /** * list of page URLs * @var string[] @@ -233,7 +226,7 @@ class ApplicationHandler extends SingletonFactory } /** - * Returns true if this is a multi-domain setup. + * Always returns false. * * @return bool * @since 3.1 @@ -241,19 +234,7 @@ class ApplicationHandler extends SingletonFactory */ public function isMultiDomainSetup() { - if ($this->isMultiDomain === null) { - $this->isMultiDomain = false; - - $domainName = $this->getApplicationByID(1)->domainName; - foreach ($this->getApplications() as $application) { - if ($application->domainName !== $domainName) { - $this->isMultiDomain = true; - break; - } - } - } - - return $this->isMultiDomain; + return false; } /** -- 2.20.1