[BUGFIX] Don't disable redirect after logout with showLogoutFormAfterLogin=1 25/48025/2
authorDaniel Goerz <ervaude@gmail.com>
Fri, 6 May 2016 13:44:14 +0000 (15:44 +0200)
committerMarkus Klein <markus.klein@typo3.org>
Mon, 9 May 2016 18:22:38 +0000 (20:22 +0200)
This patch fixes a regression where showLogoutFormAfterLogin was added
as a condition to disable redirects in fe_login at all when it should
only disable redirects after login.

Change-Id: Ide5c17f202618c9c0696bc777473a7be1b089276
Resolves: #73144
Releases: master, 7.6
Reviewed-on: https://review.typo3.org/48025
Reviewed-by: Frank Naegler <frank.naegler@typo3.org>
Tested-by: Frank Naegler <frank.naegler@typo3.org>
Reviewed-by: Zbigniew Jacko <z.jacko@macopedia.pl>
Tested-by: Zbigniew Jacko <z.jacko@macopedia.pl>
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php

index 4571b18..79c016a 100644 (file)
@@ -153,7 +153,7 @@ class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
         // Is user logged in?
         $this->userIsLoggedIn = $this->frontendController->loginUser;
         // Redirect
-        if ($this->conf['redirectMode'] && !$this->conf['redirectDisable'] && !$this->noRedirect && !$this->conf['showLogoutFormAfterLogin']) {
+        if ($this->conf['redirectMode'] && !$this->conf['redirectDisable'] && !$this->noRedirect) {
             $redirectUrl = $this->processRedirect();
             if (!empty($redirectUrl)) {
                 $this->redirectUrl = $this->conf['redirectFirstMethod'] ? array_shift($redirectUrl) : array_pop($redirectUrl);