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

diff --git a/includes/installer/WebInstallerExistingWiki.php b/includes/installer/WebInstallerExistingWiki.php
index 2c08c9c729..df68be8ef6 100644
--- a/includes/installer/WebInstallerExistingWiki.php
+++ b/includes/installer/WebInstallerExistingWiki.php
@@ -103,11 +103,11 @@ class WebInstallerExistingWiki extends WebInstallerPage {
 		$this->addHTML(
 			$this->parent->getInfoBox( wfMessage( 'config-localsettings-upgrade' )->plain() ) .
 			'<br />' .
-			$this->parent->getTextBox( array(
+			$this->parent->getTextBox( [
 				'var' => 'wgUpgradeKey',
 				'label' => 'config-localsettings-key',
-				'attribs' => array( 'autocomplete' => 'off' ),
-			) )
+				'attribs' => [ 'autocomplete' => 'off' ],
+			] )
 		);
 		$this->endForm( 'continue' );
 	}
@@ -146,7 +146,7 @@ class WebInstallerExistingWiki extends WebInstallerPage {
 		}
 
 		// Set the relevant variables from LocalSettings.php
-		$requiredVars = array( 'wgDBtype' );
+		$requiredVars = [ 'wgDBtype' ];
 		$status = $this->importVariables( $requiredVars, $vars );
 		$installer = $this->parent->getDBInstaller();
 		$status->merge( $this->importVariables( $installer->getGlobalNames(), $vars ) );
@@ -178,6 +178,13 @@ class WebInstallerExistingWiki extends WebInstallerPage {
 		// All good
 		$this->setVar( '_ExistingDBSettings', true );
 
+		// Copy $wgAuthenticationTokenVersion too, if it exists
+		$this->setVar( 'wgAuthenticationTokenVersion',
+			isset( $vars['wgAuthenticationTokenVersion'] )
+				? $vars['wgAuthenticationTokenVersion']
+				: null
+		);
+
 		return $status;
 	}