From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 4 Apr 2006 06:36:02 +0000 (+0000)
Subject: Fix use of $wgDBadminuser on 'simple' database setup, where $wgDBservers isn't set
X-Git-Tag: 1.6.0~43
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=95894dc8639a979ae246ead97eebcb517ae45f1e;p=lhc%2Fweb%2Fwiklou.git

Fix use of $wgDBadminuser on 'simple' database setup, where $wgDBservers isn't set
---

diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index a7008eff59..c1dc5b567b 100644
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -175,13 +175,15 @@ if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
 # Same with these
 $wgCommandLineMode = true;
 
-if ( empty( $wgUseNormalUser ) && isset( $wgDBadminuser ) && $wgDBservers ) {
+if ( empty( $wgUseNormalUser ) && isset( $wgDBadminuser ) ) {
 	$wgDBuser = $wgDBadminuser;
 	$wgDBpassword = $wgDBadminpassword;
 
-	foreach ( $wgDBservers as $i => $server ) {
-		$wgDBservers[$i]['user'] = $wgDBuser;
-		$wgDBservers[$i]['password'] = $wgDBpassword;
+	if( $wgDBservers ) {
+		foreach ( $wgDBservers as $i => $server ) {
+			$wgDBservers[$i]['user'] = $wgDBuser;
+			$wgDBservers[$i]['password'] = $wgDBpassword;
+		}
 	}
 }