From dba97b3e9102e30463725c089c384e4bbca569d3 Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Tue, 29 Mar 2011 17:34:00 +0000
Subject: [PATCH] minor cleanup

---
 includes/installer/Installer.php |  7 ++-----
 maintenance/install.php          | 22 +++++++---------------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 5535bd8ef7..5f982d7ef3 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -607,13 +607,10 @@ abstract class Installer {
 		$allNames = array();
 
 		foreach ( self::getDBTypes() as $name ) {
-			$db = $this->getDBInstaller( $name );
-			$readableName = wfMsg( 'config-type-' . $name );
-
-			if ( $db->isCompiled() ) {
+			if ( $this->getDBInstaller( $name )->isCompiled() ) {
 				$compiledDBs[] = $name;
 			}
-			$allNames[] = $readableName;
+			$allNames[] = wfMsg( 'config-type-' . $name );;
 		}
 
 		$this->setVar( '_CompiledDBs', $compiledDBs );
diff --git a/maintenance/install.php b/maintenance/install.php
index e782be9f4f..caaf285066 100644
--- a/maintenance/install.php
+++ b/maintenance/install.php
@@ -63,22 +63,14 @@ class CommandLineInstaller extends Maintenance {
 		$installer =
 			new CliInstaller( $siteName, $adminName, $this->mOptions );
 
-		if ( $this->hasOption( 'env-checks' ) ) {
-			$status = $installer->doEnvironmentChecks();
-			if( $status->isGood() ) {
-				$installer->showMessage( 'config-env-good' );
-			} else {
-				$installer->showStatusMessage( $status );
-				return;
-			}
+		$status = $installer->doEnvironmentChecks();
+		if( $status->isGood() ) {
+			$installer->showMessage( 'config-env-good' );
 		} else {
-			$status = $installer->doEnvironmentChecks();
-			if( $status->isGood() ) {
-				$installer->showMessage( 'config-env-good' );
-			} else {
-				$installer->showStatusMessage( $status );
-				return;
-			}
+			$installer->showStatusMessage( $status );
+			return;
+		}
+		if( !$this->getVar( 'env-checks' ) ) {
 			$installer->execute();
 			$installer->writeConfigurationFile( $this->getOption( 'confpath', $IP ) );
 		}
-- 
2.20.1