From c84a43d3eb0cf1dce3c110ebba44da7c423379c7 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sun, 26 Jan 2014 01:21:32 +0100
Subject: [PATCH] Issue #2176131 by sun: Database configuration form in
installer still uses 'db_prefix' instead of 'prefix'.
---
core/includes/install.core.inc | 7 -------
core/lib/Drupal/Core/Database/Install/Tasks.php | 2 +-
.../simpletest/lib/Drupal/simpletest/WebTestBase.php | 10 +++++++++-
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index 7286eeee16c7..0259cec80db4 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -1173,13 +1173,6 @@ function install_settings_form_validate($form, &$form_state) {
$database['namespace'] = substr($install_namespace, 0, strrpos($install_namespace, '\\'));
$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;
$errors = install_database_errors($database, $form_state['values']['settings_file']);
foreach ($errors as $name => $message) {
diff --git a/core/lib/Drupal/Core/Database/Install/Tasks.php b/core/lib/Drupal/Core/Database/Install/Tasks.php
index e80dd8687ffb..0f66af66e99f 100644
--- a/core/lib/Drupal/Core/Database/Install/Tasks.php
+++ b/core/lib/Drupal/Core/Database/Install/Tasks.php
@@ -253,7 +253,7 @@ public function getFormOptions(array $database) {
$profile = drupal_get_profile();
$db_prefix = ($profile == 'standard') ? 'drupal_' : $profile . '_';
- $form['advanced_options']['db_prefix'] = array(
+ $form['advanced_options']['prefix'] = array(
'#type' => 'textfield',
'#title' => t('Table name prefix'),
'#default_value' => '',
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
index 9d17cac6d6c0..05195e0a2c70 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
@@ -827,6 +827,11 @@ protected function setUp() {
*/
protected function installParameters() {
$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(
'interactive' => FALSE,
'parameters' => array(
@@ -834,7 +839,10 @@ protected function installParameters() {
'langcode' => 'en',
),
'forms' => array(
- 'install_settings_form' => $connection_info['default'],
+ 'install_settings_form' => array(
+ 'driver' => $driver,
+ $driver => $connection_info['default'],
+ ),
'install_configure_form' => array(
'site_name' => 'Drupal',
'site_mail' => 'simpletest@example.com',
--
GitLab