Merge "Http::getProxy() method to get proxy configuration"

[lhc/web/wiklou.git] / includes / installer / WebInstallerExistingWiki.php

diff --git a/includes/installer/WebInstallerExistingWiki.php b/includes/installer/WebInstallerExistingWiki.php
index 2c08c9c..df68be8 100644 (file)
--- 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;
        }