Skip to content

Commit

Permalink
[BUGFIX] FeLogin: FlexForm is misleading
Browse files Browse the repository at this point in the history
The option showLogoutFormAfterLogin in the FeLogin FlexForm actually
disables all redirect configuration on login. This patch reflects
that behavior by adjusting its label to better describe what it actually does.

Since the redirect is turned off if showLogoutFormAfterLogin is set
the FrontendLoginController is also prevented from gathering redirect
URLs in the first place.

Change-Id: I0be9d166e67dd055d6057e841d9fd5509ed1e8a7
Resolves: #67115
Releases: master
Reviewed-on: http://review.typo3.org/39671
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
Reviewed-by: Frank Nägler <typo3@naegler.net>
Tested-by: Frank Nägler <typo3@naegler.net>
  • Loading branch information
Daniel Goerz authored and NeoBlack committed May 29, 2015
1 parent a53fb85 commit 146435d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Expand Up @@ -159,7 +159,7 @@ public function main($content, $conf) {
// Is user logged in?
$this->userIsLoggedIn = $this->frontendController->loginUser;
// Redirect
if ($this->conf['redirectMode'] && !$this->conf['redirectDisable'] && !$this->noRedirect) {
if ($this->conf['redirectMode'] && !$this->conf['redirectDisable'] && !$this->noRedirect && !$this->conf['showLogoutFormAfterLogin']) {
$redirectUrl = $this->processRedirect();
if (count($redirectUrl)) {
$this->redirectUrl = $this->conf['redirectFirstMethod'] ? array_shift($redirectUrl) : array_pop($redirectUrl);
Expand Down
2 changes: 1 addition & 1 deletion typo3/sysext/felogin/locallang_db.xlf
Expand Up @@ -76,7 +76,7 @@
<source>Display Remember Login Option</source>
</trans-unit>
<trans-unit id="tt_content.pi_flexform.show_logoutFormAfterLogin">
<source>Display Logout Form After Successful Login</source>
<source>Disable redirect after successful login, but display logout-form</source>
</trans-unit>
<trans-unit id="tt_content.pi_flexform.groupSelectmode">
<source>FE group select mode:</source>
Expand Down

0 comments on commit 146435d

Please sign in to comment.