From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 14 Feb 2015 20:31:12 +0000 (+0100)
Subject: Fixed some routing issues
X-Git-Tag: 2.1.0_RC_1~9
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b5262498a82dd14758a6102e760c231ad8ef1ac0;p=GitHub%2FWoltLab%2FWCF.git

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 f3e8b2ba65..784175bd0d 100644
--- 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 c2e9a7c4c2..b0d223d4ee 100644
--- 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);