| Index: trunk/phase3/maintenance/commandLine.inc |
| — | — | @@ -118,11 +118,6 @@ |
| 119 | 119 | $wgUseNormalUser = true; |
| 120 | 120 | } |
| 121 | 121 | |
| 122 | | - if ( !$wgUseNormalUser ) { |
| 123 | | - $wgDBuser = $wgDBadminuser = "wikiadmin"; |
| 124 | | - $wgDBpassword = $wgDBadminpassword = trim(`wikiadmin_pass`); |
| 125 | | - } |
| 126 | | - |
| 127 | 122 | putenv( "wikilang=$lang"); |
| 128 | 123 | |
| 129 | 124 | $DP = $IP; |
| — | — | @@ -130,6 +125,11 @@ |
| 131 | 126 | |
| 132 | 127 | require_once( "$IP/includes/Defines.php" ); |
| 133 | 128 | require_once( "$IP/CommonSettings.php" ); |
| | 129 | + |
| | 130 | + if ( !$wgUseNormalUser ) { |
| | 131 | + $wgDBuser = $wgDBadminuser = "wikiadmin"; |
| | 132 | + $wgDBpassword = $wgDBadminpassword = trim(`wikiadmin_pass`); |
| | 133 | + } |
| 134 | 134 | } else { |
| 135 | 135 | $wgWikiFarm = false; |
| 136 | 136 | $settingsFile = "$IP/LocalSettings.php"; |
| — | — | @@ -155,7 +155,7 @@ |
| 156 | 156 | # Same with these |
| 157 | 157 | $wgCommandLineMode = true; |
| 158 | 158 | |
| 159 | | -if ( !empty( $wgUseNormalUser ) && isset( $wgDBadminuser ) ) { |
| | 159 | +if ( empty( $wgUseNormalUser ) && isset( $wgDBadminuser ) ) { |
| 160 | 160 | $wgDBuser = $wgDBadminuser; |
| 161 | 161 | $wgDBpassword = $wgDBadminpassword; |
| 162 | 162 | |