Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Followup r75753, combine these into one if block

Browse source
This commit is contained in:
Chad Horohoe 2010-11-01 11:50:00 +00:00
parent 69bf3a3cb0
commit 82f3f815fa
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
includes/Setup.php
View file

@ -307,16 +307,14 @@ $wgCookiePrefix = strtr($wgCookiePrefix, "=,; +.\"'\\[", "__________");
if( !wfIniGetBool( 'session.auto_start' ) )
session_name( $wgSessionName ? $wgSessionName : $wgCookiePrefix . '_session' );
if( !defined( 'MW_NO_SESSION' ) ) {
if ( !$wgCommandLineMode ) {
if( ( $wgRequest->checkSessionCookie() || isset( $_COOKIE[$wgCookiePrefix.'Token'] ) ) ) {
wfIncrStats( 'request_with_session' );
wfSetupSession();
$wgSessionStarted = true;
} else {
wfIncrStats( 'request_without_session' );
$wgSessionStarted = false;
}
if( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) {
if( $wgRequest->checkSessionCookie() || isset( $_COOKIE[$wgCookiePrefix.'Token'] ) ) {
wfIncrStats( 'request_with_session' );
wfSetupSession();
$wgSessionStarted = true;
} else {
wfIncrStats( 'request_without_session' );
$wgSessionStarted = false;
}
}