Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix ordering / use of user/admin users

Browse source
This commit is contained in:
Brion Vibber 2005-06-26 07:02:40 +00:00
parent a842807bf0
commit bf44faaba6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
maintenance/commandLine.inc
View file

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