Updated doMaintenance since wmf-config/ was moved up a dir

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index b797de6..44e0003 100644 (file)
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -74,22 +74,22 @@ require_once( MWInit::compiledPath( 'includes/DefaultSettings.php' ) );
 if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
        # Use a callback function to configure MediaWiki
        MWFunction::call( MW_CONFIG_CALLBACK );
-} elseif ( file_exists( "$IP/wmf-config/wikimedia-mode" ) ) {
+} elseif ( file_exists( "$IP/../wmf-config/wikimedia-mode" ) ) {
        // Load settings, using wikimedia-mode if needed
        // @todo FIXME: Replace this hack with general farm-friendly code
        # @todo FIXME: Wikimedia-specific stuff needs to go away to an ext
        # Maybe a hook?
        global $cluster;
        $cluster = 'pmtpa';
-       require( MWInit::interpretedPath( 'wmf-config/wgConf.php' ) );
+       require( MWInit::interpretedPath( '../wmf-config/wgConf.php' ) );
        $maintenance->loadWikimediaSettings();
-       require( MWInit::interpretedPath( '/wmf-config/CommonSettings.php' ) );
+       require( MWInit::interpretedPath( '../wmf-config/CommonSettings.php' ) );
 } else {
        require_once( $maintenance->loadSettings() );
 }
 
 if ( $maintenance->getDbType() === Maintenance::DB_ADMIN &&
-               is_readable( "$IP/AdminSettings.php" ) )
+       is_readable( "$IP/AdminSettings.php" ) )
 {
        require( MWInit::interpretedPath( 'AdminSettings.php' ) );
 }