minor cleanup

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 5535bd8..5f982d7 100644 (file)
--- 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 e782be9..caaf285 100644 (file)
--- 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 ) );
                }