From: Antoine Musso <hashar@users.mediawiki.org>
Date: Thu, 10 Nov 2011 11:18:50 +0000 (+0000)
Subject: load up includes/Setup.php before Maintenance::finalSetup()
X-Git-Tag: 1.31.0-rc.0~26597
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%22id_auteur=%24connect_id_auteur%22%29%20.%20%22?a=commitdiff_plain;h=513a094b094941b648a705905681c4d209c2a703;p=lhc%2Fweb%2Fwiklou.git

load up includes/Setup.php before Maintenance::finalSetup()

This let us get access to global functions and the autoloader when trying
to do some final setup for our maintenance scripts.
---

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index 6b29c5fd54..c93733314a 100644
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -93,10 +93,11 @@ if ( $maintenance->getDbType() === Maintenance::DB_ADMIN &&
 {
 	require( MWInit::interpretedPath( 'AdminSettings.php' ) );
 }
-$maintenance->finalSetup();
 // Some last includes
 require_once( MWInit::compiledPath( 'includes/Setup.php' ) );
 
+$maintenance->finalSetup();
+
 // Much much faster startup than creating a title object
 $wgTitle = null;