r87488 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r87487‎ | r87488 | r87489 >
Date:08:20, 5 May 2011
Author:maxsem
Status:ok
Tags:
Comment:
Bug 28822 - Upgrade from normal 1.16 wiki to 1.17 fails with fatal error
Modified paths:
  • /trunk/phase3/includes/installer/WebInstallerPage.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/installer/WebInstallerPage.php
@@ -250,7 +250,9 @@
251251 // If there is no $wgUpgradeKey, tell the user to add one to LocalSettings.php
252252 if ( $vars['wgUpgradeKey'] === false ) {
253253 if ( $this->getVar( 'wgUpgradeKey', false ) === false ) {
254 - $this->parent->generateUpgradeKey();
 254+ $secretKey = $this->getVar( 'wgSecretKey' ); // preserve $wgSecretKey
 255+ $this->parent->generateKeys();
 256+ $this->setVar( 'wgSecretKey', $secretKey );
255257 $this->setVar( '_UpgradeKeySupplied', true );
256258 }
257259 $this->startForm();

Follow-up revisions

RevisionCommit summaryAuthorDate
r874891.17: MFT r87488 (fatal on web upgrade)maxsem08:26, 5 May 2011

Status & tagging log