| Index: branches/REL1_17/phase3/includes/installer/WebInstallerPage.php |
| — | — | @@ -244,7 +244,9 @@ |
| 245 | 245 | // If there is no $wgUpgradeKey, tell the user to add one to LocalSettings.php |
| 246 | 246 | if ( $vars['wgUpgradeKey'] === false ) { |
| 247 | 247 | if ( $this->getVar( 'wgUpgradeKey', false ) === false ) { |
| 248 | | - $this->parent->generateUpgradeKey(); |
| | 248 | + $secretKey = $this->getVar( 'wgSecretKey' ); // preserve $wgSecretKey |
| | 249 | + $this->parent->generateKeys(); |
| | 250 | + $this->setVar( 'wgSecretKey', $secretKey ); |
| 249 | 251 | $this->setVar( '_UpgradeKeySupplied', true ); |
| 250 | 252 | } |
| 251 | 253 | $this->startForm(); |
| Property changes on: branches/REL1_17/phase3/includes/installer/WebInstallerPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 252 | 254 | Merged /trunk/phase3/includes/installer/WebInstallerPage.php:r87488 |