Followup r75753, combine these into one if block

diff --git a/includes/Setup.php b/includes/Setup.php
index 732e46c..d78aade 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -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;
        }
 }