From: Chad Horohoe <demon@users.mediawiki.org>
Date: Thu, 6 Jan 2011 17:41:09 +0000 (+0000)
Subject: Followup r79684: forgot to commit a file
X-Git-Tag: 1.31.0-rc.0~32757
X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=520d777c1422b9853ae5bbcb81803061e6590957;p=lhc%2Fweb%2Fwiklou.git

Followup r79684: forgot to commit a file
---

diff --git a/maintenance/install.php b/maintenance/install.php
index ef0e71e128..fb509cfe9d 100644
--- a/maintenance/install.php
+++ b/maintenance/install.php
@@ -68,7 +68,13 @@ class CommandLineInstaller extends Maintenance {
 			new CliInstaller( $siteName, $adminName, $this->mOptions );
 
 		if ( $this->hasOption( 'env-checks' ) ) {
-			$installer->doEnvironmentChecks();
+			$status = $installer->doEnvironmentChecks();
+			if( $status->isGood() ) {
+				$installer->showMessage( 'config-env-good' );
+			} else {
+				$installer->showStatusMessage( $status );
+				return;
+			}
 		} else {
 			$installer->execute();
 			$installer->writeConfigurationFile( $this->getOption( 'confpath', $IP ) );