Bug 28822 - Upgrade from normal 1.16 wiki to 1.17 fails with fatal error

diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index 64b64d6..d35046d 100644 (file)
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -250,7 +250,9 @@ class WebInstaller_ExistingWiki extends WebInstallerPage {
                // If there is no $wgUpgradeKey, tell the user to add one to LocalSettings.php
                if ( $vars['wgUpgradeKey'] === false ) {
                        if ( $this->getVar( 'wgUpgradeKey', false ) === false ) {
-                               $this->parent->generateUpgradeKey();
+                               $secretKey = $this->getVar( 'wgSecretKey' ); // preserve $wgSecretKey
+                               $this->parent->generateKeys();
+                               $this->setVar( 'wgSecretKey', $secretKey );
                                $this->setVar( '_UpgradeKeySupplied', true );
                        }
                        $this->startForm();