From 03cd386ed879e89641a7c318282dce3419c7c4b4 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 11 Sep 2009 23:18:28 +0000 Subject: [PATCH] Forward-port r53264 from wmf-deployment branch: "Adjust paths in the Wikimedia-specific command-line config hacks. Separating out most of the custom config files..." --- maintenance/doMaintenance.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php index 3453a5f241..cb6faf3070 100644 --- a/maintenance/doMaintenance.php +++ b/maintenance/doMaintenance.php @@ -58,7 +58,8 @@ if ( file_exists( "$IP/StartProfiler.php" ) ) { } // Load settings, using wikimedia-mode if needed -if( file_exists( dirname(__FILE__).'/wikimedia-mode' ) ) { +// Fixme: replace this hack with general farm-friendly code +if( file_exists( "$IP/wmf-config/wikimedia-mode" ) ) { # TODO FIXME! Wikimedia-specific stuff needs to go away to an ext # Maybe a hook? global $cluster; @@ -66,10 +67,10 @@ if( file_exists( dirname(__FILE__).'/wikimedia-mode' ) ) { $cluster = 'pmtpa'; require_once( "$IP/includes/AutoLoader.php" ); require_once( "$IP/includes/SiteConfiguration.php" ); - require( "$IP/wgConf.php" ); + require( "$IP/wmf-config/wgConf.php" ); $maintenance->loadWikimediaSettings(); require( $IP.'/includes/Defines.php' ); - require( $IP.'/CommonSettings.php' ); + require( $IP.'/wmf-config/CommonSettings.php' ); } else { require_once( "$IP/includes/AutoLoader.php" ); require_once( "$IP/includes/Defines.php" ); -- 2.20.1