From: Chad Horohoe <demon@users.mediawiki.org>
Date: Wed, 10 Feb 2010 01:44:09 +0000 (+0000)
Subject: Reduce code duplication in requires
X-Git-Tag: 1.31.0-rc.0~37844
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=cf5abc9daf79d54ec1568fda98c9812a7a5c826b;p=lhc%2Fweb%2Fwiklou.git

Reduce code duplication in requires
---

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index f99072b82d..f13ca075bc 100644
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -57,6 +57,10 @@ if ( file_exists( "$IP/StartProfiler.php" ) ) {
 	require_once( "$IP/includes/ProfilerStub.php" );
 }
 
+// Some other requires
+require_once( "$IP/includes/AutoLoader.php" );
+require_once( "$IP/includes/Defines.php" );
+
 // Load settings, using wikimedia-mode if needed
 // Fixme: replace this hack with general farm-friendly code
 if( file_exists( "$IP/wmf-config/wikimedia-mode" ) ) {
@@ -65,15 +69,11 @@ if( file_exists( "$IP/wmf-config/wikimedia-mode" ) ) {
 	global $cluster;
 	$wgWikiFarm = true;
 	$cluster = 'pmtpa';
-	require_once( "$IP/includes/AutoLoader.php" );
 	require_once( "$IP/includes/SiteConfiguration.php" );
 	require( "$IP/wmf-config/wgConf.php" );
 	$maintenance->loadWikimediaSettings();
-	require( $IP.'/includes/Defines.php' );
 	require( $IP.'/wmf-config/CommonSettings.php' );
 } else {
-	require_once( "$IP/includes/AutoLoader.php" );
-	require_once( "$IP/includes/Defines.php" );
 	require_once( $maintenance->loadSettings() );
 }
 $maintenance->finalSetup();