* run Maintenance::finalSetup() after including LocalSettings.php so that $wgDBadminu...

* fix typo in Maintenance::finalSetup(): $wgDBadminpass -> $wgDBadminpassword

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index f211822..e2005d0 100644 (file)
--- 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 fc816f4..c5df5b9 100644 (file)
--- 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" );