* Do some sanity checking and basic setup
*/
public function setup() {
- global $IP, $wgCommandLineMode, $wgUseNormalUser, $wgRequestTime;
+ global $IP, $wgCommandLineMode, $wgRequestTime;
# Abort if called from a web server
if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) {
# Turn off output buffering if it's on
@ob_end_flush();
- if ( !isset( $wgUseNormalUser ) ) {
- $wgUseNormalUser = false;
- }
-
$this->loadParamsAndArgs();
$this->maybeHelp();
$this->validateParamsAndArgs();
* Handle some last-minute setup here.
*/
public function finalSetup() {
- global $wgCommandLineMode, $wgUseNormalUser, $wgShowSQLErrors;
+ global $wgCommandLineMode, $wgShowSQLErrors;
global $wgTitle, $wgProfiling, $IP, $wgDBadminuser, $wgDBadminpassword;
global $wgDBuser, $wgDBpassword, $wgDBservers, $wgLBFactoryConf;
if( $this->mDbPass )
$wgDBadminpassword = $this->mDbPass;
- if ( empty( $wgUseNormalUser ) && isset( $wgDBadminuser ) ) {
+ if ( $this->getDbType() == self::DB_ADMIN && isset( $wgDBadminuser ) ) {
$wgDBuser = $wgDBadminuser;
$wgDBpassword = $wgDBadminpassword;
}
}
+ protected function getDbType() {
+ global $wgUseNormalUser;
+
+ return ( isset( $wgUseNormalUser ) && $wgUseNormalUser ) ?
+ Maintenance::DB_STD : Maintenance::DB_ADMIN;
+ }
+
/**
* No help, it would just be misleading since it misses custom options
*/