Commit 18cef0a5 authored by Daniel Goerz's avatar Daniel Goerz Committed by Markus Klein
Browse files

[BUGFIX] Don't disable redirect after logout with showLogoutFormAfterLogin=1

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 Nägler's avatarFrank Naegler <frank.naegler@typo3.org>
Tested-by: Frank Nägler's avatarFrank Naegler <frank.naegler@typo3.org>
Reviewed-by: default avatarZbigniew Jacko <z.jacko@macopedia.pl>
Tested-by: default avatarZbigniew Jacko <z.jacko@macopedia.pl>
Reviewed-by: Markus Klein's avatarMarkus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein's avatarMarkus Klein <markus.klein@typo3.org>
parent 8fe33996
......@@ -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);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment