| Index: trunk/phase3/includes/installer/Installer.php |
| — | — | @@ -1312,7 +1312,7 @@ |
| 1313 | 1313 | * |
| 1314 | 1314 | * @return Status |
| 1315 | 1315 | */ |
| 1316 | | - protected function generateSecretKey() { |
| | 1316 | + public function generateSecretKey() { |
| 1317 | 1317 | return $this->generateSecret( 'wgSecretKey' ); |
| 1318 | 1318 | } |
| 1319 | 1319 | |
| Index: trunk/phase3/includes/installer/WebInstallerPage.php |
| — | — | @@ -475,6 +475,12 @@ |
| 476 | 476 | <script>jQuery( "#config-spinner" )[0].style.display = "none";</script>' ); |
| 477 | 477 | $this->parent->output->flush(); |
| 478 | 478 | if ( $result ) { |
| | 479 | + // If they're going to possibly regenerate LocalSettings, we |
| | 480 | + // need to create the upgrade/secret keys. Bug 26481 |
| | 481 | + if( !$this->getVar( '_ExistingDBSettings' ) ) { |
| | 482 | + $this->parent->generateSecretKey(); |
| | 483 | + $this->parent->generateUpgradeKey(); |
| | 484 | + } |
| 479 | 485 | $this->setVar( '_UpgradeDone', true ); |
| 480 | 486 | $this->showDoneMessage(); |
| 481 | 487 | return 'output'; |