From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 14 Dec 2016 13:04:06 +0000 (+0100)
Subject: Fixed for ACP upgrade
X-Git-Tag: 3.0.0_RC_1~15
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=395025a678e4460127415a93240fcb760c3963f8;p=GitHub%2FWoltLab%2FWCF.git

Fixed for ACP upgrade
---

diff --git a/wcfsetup/install/files/lib/system/request/ControllerMap.class.php b/wcfsetup/install/files/lib/system/request/ControllerMap.class.php
index cb9a45afbf..6c7dbc9df5 100644
--- a/wcfsetup/install/files/lib/system/request/ControllerMap.class.php
+++ b/wcfsetup/install/files/lib/system/request/ControllerMap.class.php
@@ -66,13 +66,16 @@ class ControllerMap extends SingletonFactory {
 			throw new SystemException("Malformed controller name '" . $controller . "'");
 		}
 		
+		// work-around for package installation during upgrade 2.1 -> 3.0
+		if ($controller === 'InstallPackage') $application = 'wcf';
+		
 		$classData = $this->getLegacyClassData($application, $controller, $isAcpRequest);
 		if ($classData === null) {
 			$parts = explode('-', $controller);
 			$parts = array_map('ucfirst', $parts);
 			$controller = implode('', $parts);
 			
-			// work-around for upgrade path 2.1 -> 2.2
+			// work-around for upgrade path 2.1 -> 3.0
 			if ($controller === 'AjaxProxy') $controller = 'AJAXProxy';
 			
 			$classData = $this->getClassData($application, $controller, $isAcpRequest, 'page');