Reduce code duplication in requires

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index f99072b..f13ca07 100644 (file)
--- 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();