only write Dbamdinuser and password if they are set
authorAriel Glenn <ariel@users.mediawiki.org>
Mon, 27 Jul 2009 22:37:48 +0000 (22:37 +0000)
committerAriel Glenn <ariel@users.mediawiki.org>
Mon, 27 Jul 2009 22:37:48 +0000 (22:37 +0000)
config/index.php

index 7417ec8..598e356 100644 (file)
@@ -1932,8 +1932,8 @@ if ( \$wgCommandLineMode ) {
 {$dbsettings}
 
 ## Database admin settings, used for maintenance scripts
-\$wgDBadminuser     = \"{$slconf['DBadminuser']}\";
-\$wgDBadminpassword = \"{$slconf['DBadminpassword']}\";
+\$wgDBadminuser     = \"". ($conf->populateadmin ? $slconf['DBadminuser'] : '' )."\";
+\$wgDBadminpassword     = \"". ($conf->populateadmin ? $slconf['DBadminpassword'] : '' )."\";
 
 ## Shared memory settings
 \$wgMainCacheType = $cacheType;