From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sat, 26 Jun 2004 07:08:31 +0000 (+0000)
Subject: Use admin password all the time
X-Git-Tag: 1.5.0alpha1~2766
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=dc9dcba5a4f9dd700db6235a6b08cd641497d291;p=lhc%2Fweb%2Fwiklou.git

Use admin password all the time
---

diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index ee1d78e863..dc895f129c 100644
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -77,8 +77,8 @@ if ( $sep == ":" && strpos( `hostname -a`, "wikimedia.org" ) !== false ) {
 	# This is for the IRC scripts, which now run as the apache user
 	# The apache user doesn't have access to the wikiadmin_pass command
 	if ( $_ENV['USER'] != "apache" ) {
-		$wgDBadminuser = "wikiadmin";
-		$wgDBadminpassword = trim(`wikiadmin_pass`);
+		$wgDBuser = $wgDBadminuser = "wikiadmin";
+		$wgDBpassword = $wgDBadminpassword = trim(`wikiadmin_pass`);
 	}
 
 	putenv( "wikilang=$lang");
@@ -105,8 +105,11 @@ if ( $sep == ":" && strpos( `hostname -a`, "wikimedia.org" ) !== false ) {
 
 # Turn off output buffering again, it might have been turned on in the settings files
 @ob_end_flush();
-# Same with this one
+# Same with these
 $wgCommandLineMode = true;
+$wgDBuser = $wgDBadminuser;
+$wgDBpassword = $wgDBadminpassword;
+
 
 $wgUsePHPTal = false;
 define("MEDIAWIKI",true);