Showing a proper error message if user aborted the installation
authorAlexander Ebert <ebert@woltlab.com>
Mon, 15 Jul 2013 14:55:58 +0000 (16:55 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 15 Jul 2013 14:55:58 +0000 (16:55 +0200)
wcfsetup/install/files/lib/system/WCFACP.class.php

index b0853d3f419bb8454a0844749281294b017f7d27..4fb5acecc1efcbda0dec2407da022cbd483e47d9 100644 (file)
@@ -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'));