Fixed invalid controller comparison

diff --git a/wcfsetup/install/files/lib/system/request/ControllerMap.class.php b/wcfsetup/install/files/lib/system/request/ControllerMap.class.php
index 6c7dbc9df55d3b1df2d54963e0be8023ab14048b..72578d66c0d5b2010222289391d0023db5621463 100644 (file)
--- a/wcfsetup/install/files/lib/system/request/ControllerMap.class.php
+++ b/wcfsetup/install/files/lib/system/request/ControllerMap.class.php
@@ -66,9 +66,6 @@ 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);
@@ -78,6 +75,9 @@ class ControllerMap extends SingletonFactory {
                        // work-around for upgrade path 2.1 -> 3.0
                        if ($controller === 'AjaxProxy') $controller = 'AJAXProxy';
                        
+                       // work-around for package installation during upgrade 2.1 -> 3.0
+                       if ($isAcpRequest && $controller === 'InstallPackage') $application = 'wcf';
+                       
                        $classData = $this->getClassData($application, $controller, $isAcpRequest, 'page');
                        if ($classData === null) $classData = $this->getClassData($application, $controller, $isAcpRequest, 'form');
                        if ($classData === null) $classData = $this->getClassData($application, $controller, $isAcpRequest, 'action');