From 95894dc8639a979ae246ead97eebcb517ae45f1e Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 4 Apr 2006 06:36:02 +0000 Subject: [PATCH] Fix use of $wgDBadminuser on 'simple' database setup, where $wgDBservers isn't set --- maintenance/commandLine.inc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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; + } } } -- 2.20.1