From: Platonides <platonides@users.mediawiki.org>
Date: Tue, 25 Jan 2011 23:37:11 +0000 (+0000)
Subject: generateUpgradeKey() could produce NULL return, which means a fatal error when
X-Git-Tag: 1.31.0-rc.0~32356
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/fiche.php?a=commitdiff_plain;h=15c7dbed0807fb067619d292fbff1d727a7e9e92;p=lhc%2Fweb%2Fwiklou.git

generateUpgradeKey() could produce NULL return, which means a fatal error when
Call to a member function isOk() in includes/installer/WebInstallerPage.php on line 1039
---

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 507ba2ebc6..9206b36cba 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -1352,6 +1352,7 @@ abstract class Installer {
 		if ( strval( $this->getVar( 'wgUpgradeKey' ) ) === '' ) {
 			return $this->generateSecret( 'wgUpgradeKey', 16 );
 		}
+		return Status::newGood();
 	}
 
 	/**