diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2020-02-06 21:36:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-06 21:36:53 +0300 |
| commit | c5c31784221f18aeb00aa4084d05648f131e910d (patch) | |
| tree | d92039fa7fc9114ae3f370669ba1fab883de62fc /core | |
| parent | d2d7e37b7bf00ea7929da02459e4abb8640d064a (diff) | |
| parent | 0317c5b5c81d9df54c9b8c8c09c94cfdc60832e7 (diff) | |
Merge pull request #19303 from nextcloud/test/debug-install
Fix occ maintenance:install database connect failure
Diffstat (limited to 'core')
| -rw-r--r-- | core/Command/Maintenance/Install.php | 5 |
1 files changed, 4 insertions, 1 deletions
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, |