Commit b0735a04 authored by Dries's avatar Dries
Browse files

- Patch #147145 by David Strauss: remove mysql (no i) as an option when mysqli is available.

parent 2a3744c5
......@@ -213,6 +213,12 @@ function install_settings_form(&$form_state, $profile, $install_locale, $setting
$db_host = 'localhost';
}
$db_types = drupal_detect_database_types();
// If both 'mysql' and 'mysqli' are available, we disable 'mysql':
if (isset($db_types['mysqli'])) {
unset($db_types['mysql']);
}
if (count($db_types) == 0) {
$form['no_db_types'] = array(
'#value' => st('Your web server does not appear to support any common database types. Check with your hosting provider to see if they offer any databases that <a href="@drupal-databases">Drupal supports</a>.', array('@drupal-databases' => 'http://drupal.org/node/270#database')),
......@@ -226,8 +232,6 @@ function install_settings_form(&$form_state, $profile, $install_locale, $setting
);
if (count($db_types) > 1) {
// Database type
$db_types = drupal_detect_database_types();
$form['basic_options']['db_type'] = array(
'#type' => 'radios',
'#title' => st('Database type'),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment