From 831c2dee91b2656a44dd45e278b090992357f896 Mon Sep 17 00:00:00 2001
From: Helmut Hummel <info@helhum.io>
Date: Thu, 28 Apr 2016 11:42:28 +0200
Subject: [PATCH] [BUGFIX] Set correct DB configuration in step installer
After the doctrine merge, the configuration for the database name changed.
Reflect this also in the database select step, when the user chooses
to select an empty existing database.
Releases: master
Resolves: #75961
Change-Id: Ie49bf42dd2142736c4d99fe8297b688e833e1a23
Reviewed-on: https://review.typo3.org/47949
Reviewed-by: Nicole Cordes <typo3@cordes.co>
Tested-by: Nicole Cordes <typo3@cordes.co>
Reviewed-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Tested-by: Morton Jonuschat <m.jonuschat@mojocode.de>
---
.../install/Classes/Controller/Action/Step/DatabaseSelect.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/typo3/sysext/install/Classes/Controller/Action/Step/DatabaseSelect.php b/typo3/sysext/install/Classes/Controller/Action/Step/DatabaseSelect.php
index f6c12c91c4d2..3995d39e26cc 100644
--- a/typo3/sysext/install/Classes/Controller/Action/Step/DatabaseSelect.php
+++ b/typo3/sysext/install/Classes/Controller/Action/Step/DatabaseSelect.php
@@ -78,7 +78,7 @@ class DatabaseSelect extends AbstractStepAction
$existingTables = $this->databaseConnection->admin_get_tables();
$isInitialInstallation = $configurationManager->getConfigurationValueByPath('SYS/isInitialInstallationInProgress');
if (!$isInitialInstallation || empty($existingTables)) {
- $localConfigurationPathValuePairs['DB/database'] = $postValues['existing'];
+ $localConfigurationPathValuePairs['DB/Connections/Default/dbname'] = $postValues['existing'];
}
// check if database charset is utf-8
$defaultDatabaseCharset = $this->getDefaultDatabaseCharset();
--
GitLab