| Index: trunk/phase3/includes/installer/Installer.php |
| — | — | @@ -333,12 +333,14 @@ |
| 334 | 334 | $this->settings[$var] = $GLOBALS[$var]; |
| 335 | 335 | } |
| 336 | 336 | |
| | 337 | + $compiledDBs = array(); |
| 337 | 338 | foreach ( self::getDBTypes() as $type ) { |
| 338 | 339 | $installer = $this->getDBInstaller( $type ); |
| 339 | 340 | |
| 340 | 341 | if ( !$installer->isCompiled() ) { |
| 341 | 342 | continue; |
| 342 | 343 | } |
| | 344 | + $compiledDBs[] = $type; |
| 343 | 345 | |
| 344 | 346 | $defaults = $installer->getGlobalDefaults(); |
| 345 | 347 | |
| — | — | @@ -350,6 +352,7 @@ |
| 351 | 353 | } |
| 352 | 354 | } |
| 353 | 355 | } |
| | 356 | + $this->setVar( '_CompiledDBs', $compiledDBs ); |
| 354 | 357 | |
| 355 | 358 | $this->parserTitle = Title::newFromText( 'Installer' ); |
| 356 | 359 | $this->parserOptions = new ParserOptions; // language will be wrong :( |
| — | — | @@ -622,19 +625,13 @@ |
| 623 | 626 | protected function envCheckDB() { |
| 624 | 627 | global $wgLang; |
| 625 | 628 | |
| 626 | | - $compiledDBs = array(); |
| 627 | 629 | $allNames = array(); |
| 628 | 630 | |
| 629 | 631 | foreach ( self::getDBTypes() as $name ) { |
| 630 | | - if ( $this->getDBInstaller( $name )->isCompiled() ) { |
| 631 | | - $compiledDBs[] = $name; |
| 632 | | - } |
| 633 | | - $allNames[] = wfMsg( 'config-type-' . $name ); |
| | 632 | + $allNames[] = wfMsg( "config-type-$name" ); |
| 634 | 633 | } |
| 635 | 634 | |
| 636 | | - $this->setVar( '_CompiledDBs', $compiledDBs ); |
| 637 | | - |
| 638 | | - if ( !$compiledDBs ) { |
| | 635 | + if ( !$this->getVar( '_CompiledDBs' ) ) { |
| 639 | 636 | $this->showError( 'config-no-db', $wgLang->commaList( $allNames ) ); |
| 640 | 637 | // @todo FIXME: This only works for the web installer! |
| 641 | 638 | return false; |