Revert r77358, didn't have intended affect, and broke unittests

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index c33fd15..794776d 100644 (file)
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -40,6 +40,16 @@ if ( defined( 'MW_NO_SETUP' ) ) {
        return;
 }
 
+// Get an object to start us off
+$maintenance = new $maintClass();
+
+// Basic sanity checks and such
+$maintenance->setup();
+
+// We used to call this variable $self, but it was moved
+// to $maintenance->mSelf. Keep that here for b/c
+$self = $maintenance->getName();
+
 # Setup the profiler
 global $IP;
 if ( file_exists( "$IP/StartProfiler.php" ) ) {
@@ -52,16 +62,6 @@ if ( file_exists( "$IP/StartProfiler.php" ) ) {
 require_once( "$IP/includes/AutoLoader.php" );
 require_once( "$IP/includes/Defines.php" );
 
-// Get an object to start us off
-$maintenance = new $maintClass();
-
-// Basic sanity checks and such
-$maintenance->setup();
-
-// We used to call this variable $self, but it was moved
-// to $maintenance->mSelf. Keep that here for b/c
-$self = $maintenance->getName();
-
 if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
        # Use a callback function to configure MediaWiki
        require_once( "$IP/includes/DefaultSettings.php" );