From: Max Semenik <maxsem@users.mediawiki.org>
Date: Thu, 5 May 2011 08:20:15 +0000 (+0000)
Subject: Bug 28822 - Upgrade from normal 1.16 wiki to 1.17 fails with fatal error
X-Git-Tag: 1.31.0-rc.0~30394
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=01c8ce60c6bcb5123efbe8a91079d7ef87eb51ff;p=lhc%2Fweb%2Fwiklou.git

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 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();