From 3a015ed818f520ed78b17f6b9313614717e86e53 Mon Sep 17 00:00:00 2001
From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sat, 15 Aug 2009 12:24:50 +0000
Subject: [PATCH] * run Maintenance::finalSetup() after including
 LocalSettings.php so that $wgDBadminuser and $wgDBadminpassword are available
 * fix typo in Maintenance::finalSetup(): $wgDBadminpass -> $wgDBadminpassword

---
 maintenance/Maintenance.php   | 13 +++++--------
 maintenance/doMaintenance.php |  1 +
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index f211822322..e2005d03d9 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -513,11 +513,11 @@ abstract class Maintenance {
 	/**
 	 * Handle some last-minute setup here.
 	 */
-	private function finalSetup() {
+	public function finalSetup() {
 		global $wgCommandLineMode, $wgUseNormalUser, $wgShowSQLErrors;
 		global $wgTitle, $wgProfiling, $IP, $wgDBadminuser, $wgDBadminpassword;
 		global $wgDBuser, $wgDBpassword, $wgDBservers, $wgLBFactoryConf;
-		
+
 		# Turn off output buffering again, it might have been turned on in the settings files
 		if( ob_get_level() ) {
 			ob_end_flush();
@@ -529,12 +529,12 @@ abstract class Maintenance {
 		if( $this->mDbUser )
 			$wgDBadminuser = $this->mDbUser;
 		if( $this->mDbPass )
-			$wgDBadminpass = $this->mDbPass;
+			$wgDBadminpassword = $this->mDbPass;
 
 		if ( empty( $wgUseNormalUser ) && isset( $wgDBadminuser ) ) {
 			$wgDBuser = $wgDBadminuser;
 			$wgDBpassword = $wgDBadminpassword;
-	
+
 			if( $wgDBservers ) {
 				foreach ( $wgDBservers as $i => $server ) {
 					$wgDBservers[$i]['user'] = $wgDBuser;
@@ -546,7 +546,7 @@ abstract class Maintenance {
 				$wgLBFactoryConf['serverTemplate']['password'] = $wgDBpassword;
 			}
 		}
-	
+
 		if ( defined( 'MW_CMDLINE_CALLBACK' ) ) {
 			$fn = MW_CMDLINE_CALLBACK;
 			$fn();
@@ -616,8 +616,6 @@ abstract class Maintenance {
 		if ( $lang == 'test' && $site == 'wikipedia' ) {
 			define( 'TESTWIKI', 1 );
 		}
-
-		$this->finalSetup();
 	}
 
 	/**
@@ -648,7 +646,6 @@ abstract class Maintenance {
 		}
 		$wgCommandLineMode = true;
 		$DP = $IP;
-		$this->finalSetup();
 		return $settingsFile;
 	}
 	
diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index fc816f4ff7..c5df5b9c32 100644
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -72,6 +72,7 @@ if( file_exists( dirname(__FILE__).'/wikimedia-mode' ) ) {
 	require_once( "$IP/includes/Defines.php" );
 	require_once( $maintenance->loadSettings() );
 }
+$maintenance->finalSetup();
 // Some last includes
 require_once( "$IP/includes/Setup.php" );
 require_once( "$IP/install-utils.inc" );
-- 
2.20.1