| Index: branches/new-installer/phase3/includes/Setup.php |
| — | — | @@ -291,13 +291,15 @@ |
| 292 | 292 | if( !wfIniGetBool( 'session.auto_start' ) ) |
| 293 | 293 | session_name( $wgSessionName ? $wgSessionName : $wgCookiePrefix . '_session' ); |
| 294 | 294 | |
| 295 | | -if( !$wgCommandLineMode && ( $wgRequest->checkSessionCookie() || isset( $_COOKIE[$wgCookiePrefix.'Token'] ) ) ) { |
| 296 | | - wfIncrStats( 'request_with_session' ); |
| 297 | | - wfSetupSession(); |
| 298 | | - $wgSessionStarted = true; |
| 299 | | -} else { |
| 300 | | - wfIncrStats( 'request_without_session' ); |
| 301 | | - $wgSessionStarted = false; |
| | 295 | +if( !defined( 'MW_NO_SESSION' ) ) { |
| | 296 | + if( !$wgCommandLineMode && ( $wgRequest->checkSessionCookie() || isset( $_COOKIE[$wgCookiePrefix.'Token'] ) ) ) { |
| | 297 | + wfIncrStats( 'request_with_session' ); |
| | 298 | + wfSetupSession(); |
| | 299 | + $wgSessionStarted = true; |
| | 300 | + } else { |
| | 301 | + wfIncrStats( 'request_without_session' ); |
| | 302 | + $wgSessionStarted = false; |
| | 303 | + } |
| 302 | 304 | } |
| 303 | 305 | |
| 304 | 306 | wfProfileOut( $fname.'-SetupSession' ); |
| Index: branches/new-installer/phase3/config/new-index.php |
| — | — | @@ -1,6 +1,7 @@ |
| 2 | 2 | <?php |
| 3 | 3 | |
| 4 | 4 | define( 'MW_NO_DB', 1 ); |
| | 5 | +define( 'MW_NO_SESSION', 1 ); |
| 5 | 6 | define( 'MW_CONFIG_CALLBACK', 'wfInstallerConfig' ); |
| 6 | 7 | |
| 7 | 8 | function wfInstallerConfig() { |