Correctly append the port to the host so it's written to the config correctly

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php
index f92d86d0243b17c2c61fb43664414000a16a356f..fa18ef721b221b37aabb4b6971b5c5d731d4d7a5 100644 (file)
--- 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,