Fix for r70571, still have to use $_COOKIE here too, $wgContLang is undefined so far

diff --git a/includes/Setup.php b/includes/Setup.php
index 77d13d4..133be74 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -305,7 +305,7 @@ if( !wfIniGetBool( 'session.auto_start' ) )
        session_name( $wgSessionName ? $wgSessionName : $wgCookiePrefix . '_session' );
 
 if( !defined( 'MW_NO_SESSION' ) ) {
-       if( !$wgCommandLineMode && ( $wgRequest->checkSessionCookie() || $wgRequest->getCookie( 'Token' ) ) ) {
+       if( !$wgCommandLineMode && ( $wgRequest->checkSessionCookie() || isset( $_COOKIE[$wgCookiePrefix.'Token'] ) ) ) {
                wfIncrStats( 'request_with_session' );
                wfSetupSession();
                $wgSessionStarted = true;