From 46668eb156afe5f89dfe3507c9241deee90285af Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Fri, 6 Aug 2010 21:10:18 +0000
Subject: [PATCH] Fix for r70571, still have to use $_COOKIE here too,
 $wgContLang is undefined so far

---
 includes/Setup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/Setup.php b/includes/Setup.php
index 77d13d40fb..133be74125 100644
--- 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;
-- 
2.20.1