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

[lhc/web/wiklou.git] / maintenance / commandLine.inc

diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index a7008ef..c1dc5b5 100644 (file)
--- 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;
+               }
        }
 }