From 404b7a426302a6190432d1cfc7368a6261760401 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Fri, 20 May 2022 14:40:59 +0200 Subject: [PATCH] Remove `$pageName` from `wcf\system\request\Request` The value is unused and badly named, because it refers to the controller name and not the name of some page. --- .../lib/system/request/Request.class.php | 20 +------------------ .../system/request/RequestHandler.class.php | 1 - 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/wcfsetup/install/files/lib/system/request/Request.class.php b/wcfsetup/install/files/lib/system/request/Request.class.php index 64dfdabe24..d12a6607e6 100644 --- a/wcfsetup/install/files/lib/system/request/Request.class.php +++ b/wcfsetup/install/files/lib/system/request/Request.class.php @@ -41,12 +41,6 @@ final class Request implements RequestHandlerInterface */ protected $pageID; - /** - * page name - * @var string - */ - protected $pageName = ''; - /** * request object * @var object @@ -57,14 +51,12 @@ final class Request implements RequestHandlerInterface * Creates a new request object. * * @param string $className fully qualified name - * @param string $pageName class name * @param string[] $metaData additional meta data */ - public function __construct($className, $pageName, array $metaData) + public function __construct($className, array $metaData) { $this->className = $className; $this->metaData = $metaData; - $this->pageName = $pageName; } /** @@ -136,16 +128,6 @@ final class Request implements RequestHandlerInterface return $this->metaData; } - /** - * Returns the page name of this request. - * - * @return string - */ - public function getPageName() - { - return $this->pageName; - } - /** * Returns the current request object. * diff --git a/wcfsetup/install/files/lib/system/request/RequestHandler.class.php b/wcfsetup/install/files/lib/system/request/RequestHandler.class.php index 56a999f10a..2a3572ab97 100644 --- a/wcfsetup/install/files/lib/system/request/RequestHandler.class.php +++ b/wcfsetup/install/files/lib/system/request/RequestHandler.class.php @@ -213,7 +213,6 @@ final class RequestHandler extends SingletonFactory $this->activeRequest = new Request( $classData['className'], - $classData['controller'], $metaData ); -- 2.20.1