From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 16 Mar 2012 13:41:21 +0000 (+0100)
Subject: Fixed redirect to login
X-Git-Tag: 2.0.0_Beta_1~1221
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=eacc0f346077e41d12737a270686987f2ff4e596;p=GitHub%2FWoltLab%2FWCF.git

Fixed redirect to login

Fixes #528
---

diff --git a/wcfsetup/install/files/lib/system/WCFACP.class.php b/wcfsetup/install/files/lib/system/WCFACP.class.php
index 9e9095e13b..f2f72d9939 100644
--- a/wcfsetup/install/files/lib/system/WCFACP.class.php
+++ b/wcfsetup/install/files/lib/system/WCFACP.class.php
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\system;
+use wcf\system\application\ApplicationHandler;
 use wcf\system\cache\CacheHandler;
 use wcf\system\request\RouteHandler;
 use wcf\system\session\ACPSessionFactory;
@@ -56,7 +57,11 @@ class WCFACP extends WCF {
 		$pathInfo = (isset($_SERVER['PATH_INFO'])) ? $_SERVER['PATH_INFO'] : '';
 		if (empty($pathInfo) || !preg_match('~^/(ACPCaptcha|Login)/~', $pathInfo)) {
 			if (WCF::getUser()->userID == 0) {
-				util\HeaderUtil::redirect('index.php/Login/'.SID_ARG_1ST, false);
+				// build redirect path
+				$application = ApplicationHandler::getInstance()->getActiveApplication();
+				$path = $application->domainName . $application->domainPath . 'acp/index.php/Login/' . SID_ARG_1ST;
+				
+				util\HeaderUtil::redirect($path, false);
 				exit;
 			}
 			else {