X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Finstaller%2FWebInstallerExistingWiki.php;h=f25d57ce49f8233cfab63f1eb5ca53e5ec2678ed;hb=efbfa0a727a196e63a2b71f0a82f09150c2be354;hp=df68be8ef6df5e03c868e3f0206f932bc729874d;hpb=c340c41b37b5079ba90489f6b212bb8e4642031a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/WebInstallerExistingWiki.php b/includes/installer/WebInstallerExistingWiki.php
index df68be8ef6..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();
@@ -180,9 +172,7 @@ class WebInstallerExistingWiki extends WebInstallerPage {
 
 		// Copy $wgAuthenticationTokenVersion too, if it exists
 		$this->setVar( 'wgAuthenticationTokenVersion',
-			isset( $vars['wgAuthenticationTokenVersion'] )
-				? $vars['wgAuthenticationTokenVersion']
-				: null
+			$vars['wgAuthenticationTokenVersion'] ?? null
 		);
 
 		return $status;