Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

6.x
Dries Buytaert 2007-06-05 09:26:42 +00:00
parent 2a3744c572
commit b0735a04d7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
install.php
View File

@ -213,6 +213,12 @@ function install_settings_form(&$form_state, $profile, $install_locale, $setting
$db_host = 'localhost'; $db_host = 'localhost';
} }
$db_types = drupal_detect_database_types(); $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) { if (count($db_types) == 0) {
$form['no_db_types'] = array( $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')), '#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) { if (count($db_types) > 1) {
// Database type
$db_types = drupal_detect_database_types();
$form['basic_options']['db_type'] = array( $form['basic_options']['db_type'] = array(
'#type' => 'radios', '#type' => 'radios',
'#title' => st('Database type'), '#title' => st('Database type'),