Pull wgDBuser and wgDBpassword if adminuser and adminpassword are undefined, fixes...

diff --git a/maintenance/backup.inc b/maintenance/backup.inc
index e2e5363..e546df4 100644 (file)
--- a/maintenance/backup.inc
+++ b/maintenance/backup.inc
@@ -234,8 +234,16 @@ class BackupDumper {
 
        function backupDb() {
                global $wgDBadminuser, $wgDBadminpassword;
+               global $wgDBuser, $wgDBpassword;
                global $wgDBname, $wgDebugDumpSql, $wgDBtype;
                $flags = ($wgDebugDumpSql ? DBO_DEBUG : 0) | DBO_DEFAULT; // god-damn hack
+               
+               if ( !$wgDBadminuser ) {
+                       $wgDBadminuser = $wgDBuser;
+               }
+               if ( !$wgDBadminpassword ) {
+                       $wgDBadminpassword = $wgDBpassword;
+               }
 
                $class = 'Database' . ucfirst($wgDBtype);
                $db = new $class( $this->backupServer(), $wgDBadminuser, $wgDBadminpassword, $wgDBname, false, $flags );