When we failed to detect a DB driver, put the help info in the failure box, rather...

diff --git a/includes/installer/Installer.i18n.php b/includes/installer/Installer.i18n.php
index 97fdf7e..1681c29 100644 (file)
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -97,8 +97,7 @@ However, MediaWiki requires PHP $2 or higher.',
 If you run a high-traffic site, you should read a little on [http://www.mediawiki.org/wiki/Unicode_normalization_considerations Unicode normalization].",
        'config-unicode-update-warning'   => "'''Warning''': The installed version of the Unicode normalization wrapper uses an older version of [http://site.icu-project.org/ the ICU project's] library.
 You should [http://www.mediawiki.org/wiki/Unicode_normalization_considerations upgrade] if you are at all concerned about using Unicode.",
-       'config-no-db'                    => 'Could not find a suitable database driver!',
-       'config-no-db-help'               => 'You need to install a database driver for PHP.
+       'config-no-db'                    => 'Could not find a suitable database driver! You need to install a database driver for PHP.
 The following database types are supported: $1.
 
 If you are on shared hosting, ask your hosting provider to install a suitable database driver.

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index dc9767e..ba01145 100644 (file)
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -622,9 +622,8 @@ abstract class Installer {
                $this->setVar( '_CompiledDBs', $compiledDBs );
 
                if ( !$compiledDBs ) {
-                       $this->showError( 'config-no-db' );
+                       $this->showError( 'config-no-db', $wgLang->commaList( $allNames ) );
                        // FIXME: this only works for the web installer!
-                       $this->showHelpBox( 'config-no-db-help', $wgLang->commaList( $allNames ) );
                        return false;
                }