From: Chad Horohoe <demon@users.mediawiki.org>
Date: Fri, 6 Aug 2010 21:10:18 +0000 (+0000)
Subject: Fix for r70571, still have to use $_COOKIE here too, $wgContLang is undefined so far
X-Git-Tag: 1.31.0-rc.0~35660
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22calendrier%22%2C%22type=semaine%22%29%20.%20%22?a=commitdiff_plain;h=46668eb156afe5f89dfe3507c9241deee90285af;p=lhc%2Fweb%2Fwiklou.git

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 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;