Fixed bug #12072: Permanent login checkbox is not shown as expected
authorXavier Perseguers <typo3@perseguers.ch>
Thu, 10 Dec 2009 10:02:28 +0000 (10:02 +0000)
committerXavier Perseguers <typo3@perseguers.ch>
Thu, 10 Dec 2009 10:02:28 +0000 (10:02 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@6646 709f56b5-9817-0410-a4d7-c38de5d9e867

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

index dd6fb5e..955ba4b 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-10  Xavier Perseguers  <typo3@perseguers.ch>
+
+       * Fixed bug #12072: Permanent login checkbox is not shown as expected
+
 2009-12-09  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #12682: Section links coming from RTE broken in FE
index 2f22216..8b70baf 100644 (file)
@@ -510,7 +510,8 @@ class tx_felogin_pi1 extends tslib_pibase {
                }
 
 
-               if (($this->conf['showPermaLogin']) && ($GLOBALS['TYPO3_CONF_VARS']['FE']['permalogin'] == 0 || $GLOBALS['TYPO3_CONF_VARS']['FE']['permalogin'] == 1) && $GLOBALS['TYPO3_CONF_VARS']['FE']['lifetime'] > 0) {
+                       // Permanent Login is only possible if permalogin is not deactivated (-1) and lifetime is greater than 0
+               if ($this->conf['showPermaLogin'] && t3lib_div::inList('0,1,2', $GLOBALS['TYPO3_CONF_VARS']['FE']['permalogin']) && $GLOBALS['TYPO3_CONF_VARS']['FE']['lifetime'] > 0) {
                        $markerArray['###PERMALOGIN###'] = $this->pi_getLL('permalogin', '', 1);
                        if($GLOBALS['TYPO3_CONF_VARS']['FE']['permalogin'] == 1) {
                                $markerArray['###PERMALOGIN_HIDDENFIELD_ATTRIBUTES###'] = 'disabled="disabled"';