dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a842807
)
Fix ordering / use of user/admin users
author
Brion Vibber
<brion@users.mediawiki.org>
Sun, 26 Jun 2005 07:02:40 +0000
(07:02 +0000)
committer
Brion Vibber
<brion@users.mediawiki.org>
Sun, 26 Jun 2005 07:02:40 +0000
(07:02 +0000)
maintenance/commandLine.inc
patch
|
blob
|
history
diff --git
a/maintenance/commandLine.inc
b/maintenance/commandLine.inc
index
0fa7122
..
69f5aa6
100644
(file)
--- a/
maintenance/commandLine.inc
+++ b/
maintenance/commandLine.inc
@@
-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");
$DP = $IP;
putenv( "wikilang=$lang");
$DP = $IP;
@@
-130,6
+125,11
@@
if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
require_once( "$IP/includes/Defines.php" );
require_once( "$IP/CommonSettings.php" );
require_once( "$IP/includes/Defines.php" );
require_once( "$IP/CommonSettings.php" );
+
+ if ( !$wgUseNormalUser ) {
+ $wgDBuser = $wgDBadminuser = "wikiadmin";
+ $wgDBpassword = $wgDBadminpassword = trim(`wikiadmin_pass`);
+ }
} else {
$wgWikiFarm = false;
$settingsFile = "$IP/LocalSettings.php";
} else {
$wgWikiFarm = false;
$settingsFile = "$IP/LocalSettings.php";
@@
-155,7
+155,7
@@
if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
# Same with these
$wgCommandLineMode = true;
# Same with these
$wgCommandLineMode = true;
-if (
!
empty( $wgUseNormalUser ) && isset( $wgDBadminuser ) ) {
+if ( empty( $wgUseNormalUser ) && isset( $wgDBadminuser ) ) {
$wgDBuser = $wgDBadminuser;
$wgDBpassword = $wgDBadminpassword;
$wgDBuser = $wgDBadminuser;
$wgDBpassword = $wgDBadminpassword;