From 06edbf2791e2411bc7d4b7aa80680c93ea0536b6 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 16 Apr 2016 00:03:44 +0200
Subject: [PATCH] Removed delayed redirect from login/logout

---
 wcfsetup/install/files/lib/action/LogoutAction.class.php | 4 ++--
 wcfsetup/install/files/lib/form/LoginForm.class.php      | 2 +-
 wcfsetup/install/lang/de.xml                             | 2 --
 wcfsetup/install/lang/en.xml                             | 2 --
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/wcfsetup/install/files/lib/action/LogoutAction.class.php b/wcfsetup/install/files/lib/action/LogoutAction.class.php
index 895a61e34d..c86bda18dd 100644
--- a/wcfsetup/install/files/lib/action/LogoutAction.class.php
+++ b/wcfsetup/install/files/lib/action/LogoutAction.class.php
@@ -8,7 +8,7 @@ use wcf\util\HeaderUtil;
  * Does the user logout.
  * 
  * @author	Marcel Werk
- * @copyright	2001-2015 WoltLab GmbH
+ * @copyright	2001-2016 WoltLab GmbH
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @package	com.woltlab.wcf
  * @subpackage	action
@@ -37,7 +37,7 @@ class LogoutAction extends \wcf\acp\action\LogoutAction {
 		$this->executed();
 		
 		// forward to index page
-		HeaderUtil::delayedRedirect(LinkHandler::getInstance()->getLink(), WCF::getLanguage()->get('wcf.user.logout.redirect'));
+		HeaderUtil::redirect(LinkHandler::getInstance()->getLink());
 		exit;
 	}
 }
diff --git a/wcfsetup/install/files/lib/form/LoginForm.class.php b/wcfsetup/install/files/lib/form/LoginForm.class.php
index 2f4caa95c0..f7d27ffab1 100644
--- a/wcfsetup/install/files/lib/form/LoginForm.class.php
+++ b/wcfsetup/install/files/lib/form/LoginForm.class.php
@@ -73,7 +73,7 @@ class LoginForm extends \wcf\acp\form\LoginForm {
 		
 		// redirect to url
 		WCF::getTPL()->assign('__hideUserMenu', true);
-		HeaderUtil::delayedRedirect($this->url, WCF::getLanguage()->get('wcf.user.login.redirect'));
+		HeaderUtil::redirect($this->url);
 		exit;
 	}
 	
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 88c6f77ae0..bd1e6ed120 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2711,9 +2711,7 @@ Fehler sind beispielsweise:
 		<item name="wcf.user.button.register"><![CDATA[Registrieren]]></item>
 		<item name="wcf.user.button.registerNow"><![CDATA[Jetzt registrieren]]></item>
 		<item name="wcf.user.username.error.3rdParty"><![CDATA[Das Benutzerkonto ist mit einem Drittanbieter-Konto verbunden, ein Passwort kann nicht angefordert werden.]]></item>
-		<item name="wcf.user.login.redirect"><![CDATA[Sie wurden erfolgreich angemeldet.]]></item>
 		<item name="wcf.user.loginOrRegister"><![CDATA[Anmelden{if !REGISTER_DISABLED} oder registrieren{/if}]]></item>
-		<item name="wcf.user.logout.redirect"><![CDATA[Sie wurden erfolgreich abgemeldet.]]></item>
 		<item name="wcf.user.useCookies"><![CDATA[Dauerhaft angemeldet bleiben]]></item>
 		<item name="wcf.user.usernameOrEmail"><![CDATA[Benutzername oder E-Mail-Adresse]]></item>
 		<item name="wcf.user.gender.male"><![CDATA[Männlich]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index d371e85069..2666a5d501 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2742,9 +2742,7 @@ Errors are:
 		<item name="wcf.user.button.register"><![CDATA[Register]]></item>
 		<item name="wcf.user.button.registerNow"><![CDATA[Register Now]]></item>
 		<item name="wcf.user.username.error.3rdParty"><![CDATA[Account is connected with a 3rd party website, password cannot be requested.]]></item>
-		<item name="wcf.user.login.redirect"><![CDATA[You have been logged in.]]></item>
 		<item name="wcf.user.loginOrRegister"><![CDATA[Login{if !REGISTER_DISABLED} or register{/if}]]></item>
-		<item name="wcf.user.logout.redirect"><![CDATA[You have been logged off.]]></item>
 		<item name="wcf.user.useCookies"><![CDATA[Remain logged in]]></item>
 		<item name="wcf.user.usernameOrEmail"><![CDATA[Username or Email Address]]></item>
 		<item name="wcf.user.gender.male"><![CDATA[Male]]></item>
-- 
2.20.1