Merge "Set context on RedirectSpecialPage in MediaWiki.php"

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

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