* Fix for r50316 and r50324: require ProfilerStub.php if StartProfiler.php doesn...

* Removed already commented out "require_once( $IP.'/includes/ProfilerStub.php' );" now really obsolete

diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index 8ccb72b..a221e64 100644 (file)
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -45,7 +45,9 @@ $IP = strval( getenv('MW_INSTALL_PATH') ) !== ''
        : realpath( dirname( __FILE__ ) . '/..' );
 #chdir( $IP );
 if ( file_exists( "$IP/StartProfiler.php" ) ) {
-       require_once( "$IP/StartProfiler.php"  );
+       require_once( "$IP/StartProfiler.php" );
+} else {
+       require_once( "$IP/includes/ProfilerStub.php" );
 }
 
 $options = array();
@@ -196,8 +198,7 @@ if ( file_exists( dirname(__FILE__).'/wikimedia-mode' ) ) {
        $wgCommandLineMode = true;
        $DP = $IP;
        require_once( "$IP/includes/AutoLoader.php" );
-       #require_once( $IP.'/includes/ProfilerStub.php' );
-       require_once( $IP.'/includes/Defines.php' );
+       require_once( "$IP/includes/Defines.php" );
        require_once( $settingsFile );
        /* ini_set( 'include_path', ".$sep$IP$sep$IP/includes$sep$IP/languages$sep$IP/maintenance" ); */