Fixed bug #10183: [felogin] redirect doesn't work with return_url
authorSteffen Kamper <info@sk-typo3.de>
Mon, 19 Jan 2009 08:55:01 +0000 (08:55 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Mon, 19 Jan 2009 08:55:01 +0000 (08:55 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@4748 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/felogin/ChangeLog
typo3/sysext/felogin/pi1/class.tx_felogin_pi1.php

index b4a31bc..029e605 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-19  Steffen Kamper  <info@sk-typo3.de>
+
+    *  Fixed bug #10183: [felogin] redirect doesn't work with return_url
+
 2009-01-19  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Added feature 10181: htmlArea RTE: Move status bar to plugin
index e7b7ee9..977c6db 100644 (file)
@@ -1,3 +1,7 @@
+2009-01-19  Steffen Kamper  <info@sk-typo3.de>
+
+    * #10183: [felogin] redirect doesn't work with return_url
+
 2008-12-01  Steffen Kamper  <info@sk-typo3.de>
 
        * #9864: felogin: Drop languages from locallang.xml
index 94db19f..afbd724 100644 (file)
@@ -87,7 +87,10 @@ class tx_felogin_pi1 extends tslib_pibase {
                $this->logintype = t3lib_div::_GP('logintype');
                $this->redirectUrl = t3lib_div::_GP('redirect_url');
 
-
+               $returnUrl =  t3lib_div::_GP('return_url');  
+               if ($returnUrl) {
+                       $this->redirectUrl = $returnUrl;         
+               }
 
                        // Get Template
                $templateFile = $this->conf['templateFile'] ? $this->conf['templateFile'] : 'EXT:felogin/template.html';
@@ -643,4 +646,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/felogin
        include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/felogin/pi1/class.tx_felogin_pi1.php']);
 }
 
-?>
\ No newline at end of file
+?>