From ae14caab7e415215c1ff8d33d3b9a71d8c51ee4c Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Mon, 15 Jul 2013 16:55:58 +0200 Subject: [PATCH] Showing a proper error message if user aborted the installation --- wcfsetup/install/files/lib/system/WCFACP.class.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/wcfsetup/install/files/lib/system/WCFACP.class.php b/wcfsetup/install/files/lib/system/WCFACP.class.php index b0853d3f41..4fb5acecc1 100644 --- a/wcfsetup/install/files/lib/system/WCFACP.class.php +++ b/wcfsetup/install/files/lib/system/WCFACP.class.php @@ -6,6 +6,7 @@ use wcf\system\application\ApplicationHandler; use wcf\system\cache\builder\PackageCacheBuilder; use wcf\system\exception\AJAXException; use wcf\system\exception\PermissionDeniedException; +use wcf\system\exception\SystemException; use wcf\system\request\RouteHandler; use wcf\system\session\ACPSessionFactory; use wcf\system\session\SessionHandler; @@ -66,6 +67,10 @@ class WCFACP extends WCF { // build redirect path $application = ApplicationHandler::getInstance()->getActiveApplication(); + if ($application === null) { + throw new SystemException("You have aborted the installation, therefore this installation is unusable. You are required to reinstall the software."); + } + // fallback for unknown host (rescue mode) if ($application->domainName != $_SERVER['HTTP_HOST']) { $pageURL = RouteHandler::getProtocol() . $_SERVER['HTTP_HOST'] . RouteHandler::getPath(array('acp')); -- 2.20.1