/**
* 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();
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;
$wgLBFactoryConf['serverTemplate']['password'] = $wgDBpassword;
}
}
-
+
if ( defined( 'MW_CMDLINE_CALLBACK' ) ) {
$fn = MW_CMDLINE_CALLBACK;
$fn();
if ( $lang == 'test' && $site == 'wikipedia' ) {
define( 'TESTWIKI', 1 );
}
-
- $this->finalSetup();
}
/**
}
$wgCommandLineMode = true;
$DP = $IP;
- $this->finalSetup();
return $settingsFile;
}
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" );