From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sat, 6 Feb 2010 14:29:37 +0000 (+0000)
Subject: Use $wgUseNormalUser only in commandLine.inc (and use getDbType() instead in Maintenance)
X-Git-Tag: 1.31.0-rc.0~37905
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=6a238e13cab53067e1e6609627e52f777c49f316;p=lhc%2Fweb%2Fwiklou.git

Use $wgUseNormalUser only in commandLine.inc (and use getDbType() instead in Maintenance)
---

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 14602568e3..8dc9d5324a 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -356,7 +356,7 @@ abstract class Maintenance {
 	 * 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 ) ) {
@@ -406,10 +406,6 @@ abstract class Maintenance {
 		# Turn off output buffering if it's on
 		@ob_end_flush();
 
-		if ( !isset( $wgUseNormalUser ) ) {
-			$wgUseNormalUser = false;
-		}
-
 		$this->loadParamsAndArgs();
 		$this->maybeHelp();
 		$this->validateParamsAndArgs();
@@ -603,7 +599,7 @@ abstract class Maintenance {
 	 * 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;
 
@@ -620,7 +616,7 @@ abstract class Maintenance {
 		if( $this->mDbPass )
 			$wgDBadminpassword = $this->mDbPass;
 
-		if ( empty( $wgUseNormalUser ) && isset( $wgDBadminuser ) ) {
+		if ( $this->getDbType() == self::DB_ADMIN && isset( $wgDBadminuser ) ) {
 			$wgDBuser = $wgDBadminuser;
 			$wgDBpassword = $wgDBadminpassword;
 
diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index 625161a98a..ab7c0a844b 100644
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -18,6 +18,13 @@ class CommandLineInc extends Maintenance {
 		}
 	}
 
+	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
 	 */