From 0317c5b5c81d9df54c9b8c8c09c94cfdc60832e7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 5 Feb 2020 12:47:08 +0100
Subject: [PATCH] Correctly append the port to the host so it's written to the
config correctly
Signed-off-by: Joas Schilling <coding@schilljs.com>
---
core/Command/Maintenance/Install.php | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php
index f92d86d0243..fa18ef721b2 100644
--- a/core/Command/Maintenance/Install.php
+++ b/core/Command/Maintenance/Install.php
@@ -134,6 +134,10 @@ class Install extends Command {
} else {
$dbHost = $input->getOption('database-host');
}
+ if ($dbPort) {
+ // Append the port to the host so it is the same as in the config (there is no dbport config)
+ $dbHost .= ':' . $dbPort;
+ }
$dbTablePrefix = 'oc_';
if ($input->hasParameterOption('--database-table-prefix')) {
$dbTablePrefix = (string) $input->getOption('database-table-prefix');
@@ -183,7 +187,6 @@ class Install extends Command {
'dbpass' => $dbPass,
'dbname' => $dbName,
'dbhost' => $dbHost,
- 'dbport' => $dbPort,
'dbtableprefix' => $dbTablePrefix,
'adminlogin' => $adminLogin,
'adminpass' => $adminPassword,
--
GitLab