| Index: trunk/phase3/includes/Setup.php |
| — | — | @@ -307,16 +307,14 @@ |
| 308 | 308 | if( !wfIniGetBool( 'session.auto_start' ) ) |
| 309 | 309 | session_name( $wgSessionName ? $wgSessionName : $wgCookiePrefix . '_session' ); |
| 310 | 310 | |
| 311 | | -if( !defined( 'MW_NO_SESSION' ) ) { |
| 312 | | - if ( !$wgCommandLineMode ) { |
| 313 | | - if( ( $wgRequest->checkSessionCookie() || isset( $_COOKIE[$wgCookiePrefix.'Token'] ) ) ) { |
| 314 | | - wfIncrStats( 'request_with_session' ); |
| 315 | | - wfSetupSession(); |
| 316 | | - $wgSessionStarted = true; |
| 317 | | - } else { |
| 318 | | - wfIncrStats( 'request_without_session' ); |
| 319 | | - $wgSessionStarted = false; |
| 320 | | - } |
| | 311 | +if( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) { |
| | 312 | + if( $wgRequest->checkSessionCookie() || isset( $_COOKIE[$wgCookiePrefix.'Token'] ) ) { |
| | 313 | + wfIncrStats( 'request_with_session' ); |
| | 314 | + wfSetupSession(); |
| | 315 | + $wgSessionStarted = true; |
| | 316 | + } else { |
| | 317 | + wfIncrStats( 'request_without_session' ); |
| | 318 | + $wgSessionStarted = false; |
| 321 | 319 | } |
| 322 | 320 | } |
| 323 | 321 | |