From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 11 Sep 2009 23:18:28 +0000 (+0000)
Subject: Forward-port r53264 from wmf-deployment branch: "Adjust paths in the Wikimedia-specif... 
X-Git-Tag: 1.31.0-rc.0~39780
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=03cd386ed879e89641a7c318282dce3419c7c4b4;p=lhc%2Fweb%2Fwiklou.git

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..."
---

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" );