From 01c8ce60c6bcb5123efbe8a91079d7ef87eb51ff Mon Sep 17 00:00:00 2001 From: Max Semenik Date: Thu, 5 May 2011 08:20:15 +0000 Subject: [PATCH] Bug 28822 - Upgrade from normal 1.16 wiki to 1.17 fails with fatal error --- includes/installer/WebInstallerPage.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php index 64b64d6358..d35046d720 100644 --- 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(); -- 2.20.1