Fixed some routing issues

diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js
index f3e8b2ba65184920b8e6c2899f9978e2a3f8c718..784175bd0dc1e389fdacfc90e744b0d864cca140 100644 (file)
--- a/wcfsetup/install/files/acp/js/WCF.ACP.js
+++ b/wcfsetup/install/files/acp/js/WCF.ACP.js
@@ -420,7 +420,7 @@ WCF.ACP.Package.Installation = Class.extend({
                        failure: $.proxy(this._failure, this),
                        showLoadingOverlay: false,
                        success: $.proxy(this._success, this),
-                       url: 'index.php?' + $actionName + '/?t=' + SECURITY_TOKEN + SID_ARG_2ND
+                       url: 'index.php?' + $actionName + '/&t=' + SECURITY_TOKEN + SID_ARG_2ND
                });
        },
        
@@ -1798,7 +1798,7 @@ WCF.ACP.Worker = Class.extend({
                        },
                        showLoadingOverlay: false,
                        success: $.proxy(this._success, this),
-                       url: 'index.php?worker-proxy/?t=' + SECURITY_TOKEN + SID_ARG_2ND
+                       url: 'index.php?worker-proxy/&t=' + SECURITY_TOKEN + SID_ARG_2ND
                });
                this._title = title;
        },
@@ -2447,7 +2447,7 @@ WCF.ACP.Import.Manager = Class.extend({
                this._proxy = new WCF.Action.Proxy({
                        showLoadingOverlay: false,
                        success: $.proxy(this._success, this),
-                       url: 'index.php?worker-proxy/?t=' + SECURITY_TOKEN + SID_ARG_2ND
+                       url: 'index.php?worker-proxy/&t=' + SECURITY_TOKEN + SID_ARG_2ND
                });
                this._redirectURL = redirectURL;
                
@@ -2474,7 +2474,7 @@ WCF.ACP.Import.Manager = Class.extend({
                                        success: $.proxy(function() {
                                                window.location = this._redirectURL;
                                        }, this),
-                                       url: 'index.php?cache-clear/?t=' + SECURITY_TOKEN + SID_ARG_2ND
+                                       url: 'index.php?cache-clear/&t=' + SECURITY_TOKEN + SID_ARG_2ND
                                });
                        }, this)).appendTo($form);
                        

diff --git a/wcfsetup/install/files/lib/system/request/RequestHandler.class.php b/wcfsetup/install/files/lib/system/request/RequestHandler.class.php
index c2e9a7c4c2ec150486f2cd03eabf5d7c3d265efc..b0d223d4ee76f5f43e241862b9ff725c07dba4e3 100644 (file)
--- a/wcfsetup/install/files/lib/system/request/RequestHandler.class.php
+++ b/wcfsetup/install/files/lib/system/request/RequestHandler.class.php
@@ -201,6 +201,15 @@ class RequestHandler extends SingletonFactory {
                                throw new SystemException("Illegal class name '".$controller."'");
                        }
                        
+                       // work-around for WCFSetup
+                       if (!PACKAGE_ID) {
+                               $parts = explode('-', $controller);
+                               $parts = array_map(function($part) {
+                                       return ucfirst($part);
+                               }, $parts);
+                               $controller = implode('', $parts);
+                       }
+                       
                        // find class
                        $classData = $this->getClassData($controller, 'page', $application);
                        if ($classData === null) $classData = $this->getClassData($controller, 'form', $application);