Index: trunk/phase3/includes/installer/WebInstallerPage.php |
— | — | @@ -250,7 +250,9 @@ |
251 | 251 | // If there is no $wgUpgradeKey, tell the user to add one to LocalSettings.php |
252 | 252 | if ( $vars['wgUpgradeKey'] === false ) { |
253 | 253 | 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 ); |
255 | 257 | $this->setVar( '_UpgradeKeySupplied', true ); |
256 | 258 | } |
257 | 259 | $this->startForm(); |