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 ea6813e007dfd676bcd12be227239cf6d7f564b9..7ffdf8c88037253e182dad10ccea42c1e16afbc8 100755 (executable)
--- 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 c7f0d9a090e227dc2d8505dbe0bf875d71fe94ca..d2bcda310575846dc4dfea45836751a610e152a8 100755 (executable)
--- 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;
        }