Followup r71441, break up messages by type, iterate over known types. Expand on info...

diff --git a/includes/installer/Installer.i18n.php b/includes/installer/Installer.i18n.php
index 2e649da..e74fbe5 100644 (file)
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -224,11 +224,14 @@ Consider putting the database somewhere else altogether, for example in <code>/v
        'config-type-postgres'            => 'PostgreSQL',
        'config-type-sqlite'              => 'SQLite',
        'config-type-oracle'              => 'Oracle',
-       'config-type-info' => 'MediaWiki supports the following database systems:
+       'config-support-info'             => 'MediaWiki supports the following database systems:
 
-* $1 is the primary target for MediaWiki and is best supported ([http://www.php.net/manual/en/mysql.installation.php how to compile PHP with MySQL support])
-* $2 is a popular open souce database system as an alternative to MySQL ([http://www.php.net/manual/en/pgsql.installation.php how to compile PHP with PostgreSQL support])
-* $3 is a lightweight database system which is very well supported. ([http://www.php.net/manual/en/pdo.installation.php How to compile PHP with SQLite support], uses PDO)',
+$1
+
+If you do not see the database system you are trying to use listed below, then follow the instructions linked above to enable support.',
+       'config-support-mysql'            => '* $1 is the primary target for MediaWiki and is best supported ([http://www.php.net/manual/en/mysql.installation.php how to compile PHP with MySQL support])',
+       'config-support-postgres'         => '* $1 is a popular open souce database system as an alternative to MySQL ([http://www.php.net/manual/en/pgsql.installation.php how to compile PHP with PostgreSQL support])',
+       'config-support-sqlite'           => '* $1 is a lightweight database system which is very well supported. ([http://www.php.net/manual/en/pdo.installation.php How to compile PHP with SQLite support], uses PDO)',
        'config-header-mysql'             => 'MySQL settings',
        'config-header-postgres'          => 'PostgreSQL settings',
        'config-header-sqlite'            => 'SQLite settings',

diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index c075ea0..dbbfcb8 100644 (file)
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -225,11 +225,13 @@ class WebInstaller_DBConnect extends WebInstallerPage {
                $settings = '';
                $defaultType = $this->getVar( 'wgDBtype' );
 
-               $mysql = DatabaseMysql::getSoftwareLink();
-               $postgres = DatabasePostgres::getSoftwareLink();
-               $sqlite = DatabaseSqlite::getSoftwareLink();
+               $dbSupport = '';
+               foreach( $this->parent->getDBTypes() as $type ) {
+                       $db = 'Database' . ucfirst( $type );
+                       $dbSupport .= wfMsgNoTrans( "config-support-$type", $db::getSoftwareLink() ) . "\n";
+               }
                $this->addHTML( $this->parent->getInfoBox(
-                       wfMsg( 'config-type-info', $mysql, $postgres, $sqlite ) ) );
+                       wfMsg( 'config-support-info', $dbSupport ) ) );
 
                foreach ( $this->parent->getVar( '_CompiledDBs' ) as $type ) {
                        $installer = $this->parent->getDBInstaller( $type );