| Index: trunk/phase3/maintenance/install.php |
| — | — | @@ -63,22 +63,14 @@ |
| 64 | 64 | $installer = |
| 65 | 65 | new CliInstaller( $siteName, $adminName, $this->mOptions ); |
| 66 | 66 | |
| 67 | | - if ( $this->hasOption( 'env-checks' ) ) { |
| 68 | | - $status = $installer->doEnvironmentChecks(); |
| 69 | | - if( $status->isGood() ) { |
| 70 | | - $installer->showMessage( 'config-env-good' ); |
| 71 | | - } else { |
| 72 | | - $installer->showStatusMessage( $status ); |
| 73 | | - return; |
| 74 | | - } |
| | 67 | + $status = $installer->doEnvironmentChecks(); |
| | 68 | + if( $status->isGood() ) { |
| | 69 | + $installer->showMessage( 'config-env-good' ); |
| 75 | 70 | } else { |
| 76 | | - $status = $installer->doEnvironmentChecks(); |
| 77 | | - if( $status->isGood() ) { |
| 78 | | - $installer->showMessage( 'config-env-good' ); |
| 79 | | - } else { |
| 80 | | - $installer->showStatusMessage( $status ); |
| 81 | | - return; |
| 82 | | - } |
| | 71 | + $installer->showStatusMessage( $status ); |
| | 72 | + return; |
| | 73 | + } |
| | 74 | + if( !$this->getVar( 'env-checks' ) ) { |
| 83 | 75 | $installer->execute(); |
| 84 | 76 | $installer->writeConfigurationFile( $this->getOption( 'confpath', $IP ) ); |
| 85 | 77 | } |
| Index: trunk/phase3/includes/installer/Installer.php |
| — | — | @@ -607,13 +607,10 @@ |
| 608 | 608 | $allNames = array(); |
| 609 | 609 | |
| 610 | 610 | foreach ( self::getDBTypes() as $name ) { |
| 611 | | - $db = $this->getDBInstaller( $name ); |
| 612 | | - $readableName = wfMsg( 'config-type-' . $name ); |
| 613 | | - |
| 614 | | - if ( $db->isCompiled() ) { |
| | 611 | + if ( $this->getDBInstaller( $name )->isCompiled() ) { |
| 615 | 612 | $compiledDBs[] = $name; |
| 616 | 613 | } |
| 617 | | - $allNames[] = $readableName; |
| | 614 | + $allNames[] = wfMsg( 'config-type-' . $name );; |
| 618 | 615 | } |
| 619 | 616 | |
| 620 | 617 | $this->setVar( '_CompiledDBs', $compiledDBs ); |