Index: branches/new-installer/phase3/includes/installer/WebInstaller.php |
— | — | @@ -817,12 +817,13 @@ |
818 | 818 | $userLang = $r->getVal( 'UserLang' ); |
819 | 819 | $contLang = $r->getVal( 'ContLang' ); |
820 | 820 | |
| 821 | + $lifetime = intval( ini_get( 'session.gc_maxlifetime' ) ); |
| 822 | + if ( !$lifetime ) { |
| 823 | + $lifetime = 1440; // PHP default |
| 824 | + } |
| 825 | + |
821 | 826 | if ( $r->wasPosted() ) { |
822 | 827 | # Do session test |
823 | | - $lifetime = intval( ini_get( 'session.gc_maxlifetime' ) ); |
824 | | - if ( !$lifetime ) { |
825 | | - $lifetime = 1440; // PHP default |
826 | | - } |
827 | 828 | if ( $this->parent->getSession( 'test' ) === null ) { |
828 | 829 | $requestTime = $r->getVal( 'LanguageRequestTime' ); |
829 | 830 | if ( !$requestTime ) { |