[BUGFIX] Don't preserve piVars in felogin links

Change-Id: Icb60d6ab5725da2ffe5f67c2b0dcf02280a91ab3
Releases: 6.1, 6.0, 4.7
Fixes: #46829
Reviewed-on: https://review.typo3.org/20002
Reviewed-by: Markus Klein
Reviewed-by: Michael Stucki
Tested-by: Michael Stucki

diff --git a/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php b/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
index 2fbe10d..097a8b4 100644 (file)
--- a/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
+++ b/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
@@ -869,7 +869,8 @@ class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
                        $getVars['no_cache'],
                        $getVars['logintype'],
                        $getVars['redirect_url'],
                        $getVars['no_cache'],
                        $getVars['logintype'],
                        $getVars['redirect_url'],

-                       $getVars['cHash']
+                       $getVars['cHash'],
+                       $getVars[$this->prefixId]

                );
                if ($this->conf['preserveGETvars'] === 'all') {
                        $preserveQueryParts = $getVars;
                );
                if ($this->conf['preserveGETvars'] === 'all') {
                        $preserveQueryParts = $getVars;

diff --git a/typo3/sysext/felogin/Tests/Unit/Controller/FrontendLoginControllerTest.php b/typo3/sysext/felogin/Tests/Unit/Controller/FrontendLoginControllerTest.php
index 83c20c0..77fc328 100644 (file)
--- a/typo3/sysext/felogin/Tests/Unit/Controller/FrontendLoginControllerTest.php
+++ b/typo3/sysext/felogin/Tests/Unit/Controller/FrontendLoginControllerTest.php
@@ -309,6 +309,9 @@ class FrontendLoginTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                        'special2' => array(
                                                'foo' => 'bar',
                                        ),
                                        'special2' => array(
                                                'foo' => 'bar',
                                        ),

+                                       'tx_felogin_pi1' => array(
+                                               'forgot' => 1,
+                                       ),

                                ),
                                'all',
                                '&special1=23&special2[foo]=bar',
                                ),
                                'all',
                                '&special1=23&special2[foo]=bar',