X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Finstaller%2FWebInstallerExistingWiki.php;h=f25d57ce49f8233cfab63f1eb5ca53e5ec2678ed;hb=520b167979260edf2cee41842e526ec985c37f92;hp=0c7428fafc8ce616a328459ecc084f388e08a7c2;hpb=067b22566476639d404d1caaf9a460a4a0a398fe;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/installer/WebInstallerExistingWiki.php b/includes/installer/WebInstallerExistingWiki.php index 0c7428fafc..f25d57ce49 100644 --- a/includes/installer/WebInstallerExistingWiki.php +++ b/includes/installer/WebInstallerExistingWiki.php @@ -154,16 +154,8 @@ class WebInstallerExistingWiki extends WebInstallerPage { return $status; } - if ( isset( $vars['wgDBadminuser'] ) ) { - $this->setVar( '_InstallUser', $vars['wgDBadminuser'] ); - } else { - $this->setVar( '_InstallUser', $vars['wgDBuser'] ); - } - if ( isset( $vars['wgDBadminpassword'] ) ) { - $this->setVar( '_InstallPassword', $vars['wgDBadminpassword'] ); - } else { - $this->setVar( '_InstallPassword', $vars['wgDBpassword'] ); - } + $this->setVar( '_InstallUser', $vars['wgDBadminuser'] ?? $vars['wgDBuser'] ); + $this->setVar( '_InstallPassword', $vars['wgDBadminpassword'] ?? $vars['wgDBpassword'] ); // Test the database connection $status = $installer->getConnection();