(bug 26481) $wgUpgradeKey/$wgSecretKey values sometimes not filled - only happened...

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index e9f970b..5535bd8 100644 (file)
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -1312,7 +1312,7 @@ abstract class Installer {
         *
         * @return Status
         */
-       protected function generateSecretKey() {
+       public function generateSecretKey() {
                return $this->generateSecret( 'wgSecretKey' );
        }
 

diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index efb23b2..ef35b24 100644 (file)
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -475,6 +475,12 @@ class WebInstaller_Upgrade extends WebInstallerPage {
 <script>jQuery( "#config-spinner" )[0].style.display = "none";</script>' );
                        $this->parent->output->flush();
                        if ( $result ) {
+                               // If they're going to possibly regenerate LocalSettings, we
+                               // need to create the upgrade/secret keys. Bug 26481
+                               if( !$this->getVar( '_ExistingDBSettings' ) ) {
+                                       $this->parent->generateSecretKey();
+                                       $this->parent->generateUpgradeKey();
+                               }
                                $this->setVar( '_UpgradeDone', true );
                                $this->showDoneMessage();
                                return 'output';