From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 26 Jun 2005 07:02:40 +0000 (+0000)
Subject: Fix ordering / use of user/admin users
X-Git-Tag: 1.5.0beta1~5
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=bf44faaba6076935940e1c7de308e68fe94bbb5b;p=lhc%2Fweb%2Fwiklou.git

Fix ordering / use of user/admin users
---

diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index 0fa7122b2c..69f5aa6dbb 100644
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -118,11 +118,6 @@ if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
 		$wgUseNormalUser = true;
 	}
 
-	if ( !$wgUseNormalUser ) {
-		$wgDBuser = $wgDBadminuser = "wikiadmin";
-		$wgDBpassword = $wgDBadminpassword = trim(`wikiadmin_pass`);
-	}
-
 	putenv( "wikilang=$lang");
 
 	$DP = $IP;
@@ -130,6 +125,11 @@ if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
 
 	require_once( "$IP/includes/Defines.php" );
 	require_once( "$IP/CommonSettings.php" );
+
+	if ( !$wgUseNormalUser ) {
+		$wgDBuser = $wgDBadminuser = "wikiadmin";
+		$wgDBpassword = $wgDBadminpassword = trim(`wikiadmin_pass`);
+	}
 } else {
 	$wgWikiFarm = false;
 	$settingsFile = "$IP/LocalSettings.php";
@@ -155,7 +155,7 @@ if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
 # Same with these
 $wgCommandLineMode = true;
 
-if ( !empty( $wgUseNormalUser ) && isset( $wgDBadminuser ) ) {
+if ( empty( $wgUseNormalUser ) && isset( $wgDBadminuser ) ) {
 	$wgDBuser = $wgDBadminuser;
 	$wgDBpassword = $wgDBadminpassword;