From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 29 Oct 2012 01:12:19 +0000 (+0100)
Subject: Fixed redirect URLs
X-Git-Tag: 2.0.0_Beta_1~830^2~4
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9e84628e6be11ff45f407b1201c5624db7e829c3;p=GitHub%2FWoltLab%2FWCF.git

Fixed redirect URLs
---

diff --git a/wcfsetup/install/files/lib/acp/action/LogoutAction.class.php b/wcfsetup/install/files/lib/acp/action/LogoutAction.class.php
index ea6813e007..7ffdf8c880 100755
--- a/wcfsetup/install/files/lib/acp/action/LogoutAction.class.php
+++ b/wcfsetup/install/files/lib/acp/action/LogoutAction.class.php
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\acp\action;
 use wcf\action\AbstractSecureAction;
+use wcf\system\application\ApplicationHandler;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\WCF;
 use wcf\util\HeaderUtil;
@@ -34,7 +35,9 @@ class LogoutAction extends AbstractSecureAction {
 		
 		// forward to index page
 		// warning: if doLogout() writes a cookie this is buggy in MS IIS
-		HeaderUtil::redirect('index.php'.SID_ARG_1ST);
+		$application = ApplicationHandler::getInstance()->getActiveApplication();
+		$path = $application->getPageURL() . 'acp/index.php' . SID_ARG_1ST;
+		HeaderUtil::redirect($path);
 		exit;
 	}
 }
diff --git a/wcfsetup/install/files/lib/acp/form/LoginForm.class.php b/wcfsetup/install/files/lib/acp/form/LoginForm.class.php
index c7f0d9a090..d2bcda3105 100755
--- a/wcfsetup/install/files/lib/acp/form/LoginForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/LoginForm.class.php
@@ -2,6 +2,7 @@
 namespace wcf\acp\form;
 use wcf\data\user\User;
 use wcf\form\AbstractForm;
+use wcf\system\application\ApplicationHandler;
 use wcf\system\exception\PermissionDeniedException;
 use wcf\system\exception\UserInputException;
 use wcf\system\user\authentication\EmailUserAuthentication;
@@ -139,7 +140,9 @@ class LoginForm extends AbstractForm {
 			HeaderUtil::redirect($this->url);
 		}
 		else {
-			HeaderUtil::redirect('index.php'.SID_ARG_1ST);
+			$application = ApplicationHandler::getInstance()->getActiveApplication();
+			$path = $application->getPageURL() . 'acp/index.php' . SID_ARG_1ST;
+			HeaderUtil::redirect($path);
 		}
 		exit;
 	}