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

Issue #2176131 by sun: Database configuration form in installer still uses 'db_prefix' instead of 'prefix'.

8.0.x
Alex Pott 2014-01-26 01:21:32 +01:00
parent ff0fdc469d
commit c84a43d3eb
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/includes/install.core.inc
View File

@ -1173,13 +1173,6 @@ function install_settings_form_validate($form, &$form_state) {
$database['namespace'] = substr($install_namespace, 0, strrpos($install_namespace, '\\')); $database['namespace'] = substr($install_namespace, 0, strrpos($install_namespace, '\\'));
$database['driver'] = $driver; $database['driver'] = $driver;
// @todo PIFR uses 'db_prefix' instead of 'prefix'. Remove this when it gets
// fixed.
if (!$test_prefix) {
$database['prefix'] = $database['db_prefix'];
}
unset($database['db_prefix']);
$form_state['storage']['database'] = $database; $form_state['storage']['database'] = $database;
$errors = install_database_errors($database, $form_state['values']['settings_file']); $errors = install_database_errors($database, $form_state['values']['settings_file']);
foreach ($errors as $name => $message) { foreach ($errors as $name => $message) {

2
core/lib/Drupal/Core/Database/Install/Tasks.php
View File

@ -253,7 +253,7 @@ abstract class Tasks {
$profile = drupal_get_profile(); $profile = drupal_get_profile();
$db_prefix = ($profile == 'standard') ? 'drupal_' : $profile . '_'; $db_prefix = ($profile == 'standard') ? 'drupal_' : $profile . '_';
$form['advanced_options']['db_prefix'] = array( $form['advanced_options']['prefix'] = array(
'#type' => 'textfield', '#type' => 'textfield',
'#title' => t('Table name prefix'), '#title' => t('Table name prefix'),
'#default_value' => '', '#default_value' => '',

10
core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
View File

@ -827,6 +827,11 @@ abstract class WebTestBase extends TestBase {
*/ */
protected function installParameters() { protected function installParameters() {
$connection_info = Database::getConnectionInfo(); $connection_info = Database::getConnectionInfo();
$driver = $connection_info['default']['driver'];
unset($connection_info['default']['driver']);
unset($connection_info['default']['namespace']);
unset($connection_info['default']['pdo']);
unset($connection_info['default']['init_commands']);
$parameters = array( $parameters = array(
'interactive' => FALSE, 'interactive' => FALSE,
'parameters' => array( 'parameters' => array(
@ -834,7 +839,10 @@ abstract class WebTestBase extends TestBase {
'langcode' => 'en', 'langcode' => 'en',
), ),
'forms' => array( 'forms' => array(
'install_settings_form' => $connection_info['default'], 'install_settings_form' => array(
'driver' => $driver,
$driver => $connection_info['default'],
),
'install_configure_form' => array( 'install_configure_form' => array(
'site_name' => 'Drupal', 'site_name' => 'Drupal',
'site_mail' => 'simpletest@example.com', 'site_mail' => 'simpletest@example.com',