Skip to content
Snippets Groups Projects
Commit 389916b8 authored by Neil Drumm's avatar Neil Drumm :wave:
Browse files

#84173 by plumbley and Jax. Don't assume the database port is set.

parent 7851004a
No related branches found
No related tags found
2 merge requests!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!789Issue #3210310: Adjust Database API to remove deprecated Drupal 9 code in Drupal 10
...@@ -110,7 +110,7 @@ function install_verify_settings() { ...@@ -110,7 +110,7 @@ function install_verify_settings() {
$db_user = urldecode($url['user']); $db_user = urldecode($url['user']);
$db_pass = urldecode($url['pass']); $db_pass = urldecode($url['pass']);
$db_host = urldecode($url['host']); $db_host = urldecode($url['host']);
$db_port = urldecode($url['port']); $db_port = isset($url['port']) ? urldecode($url['port']) : '';
$db_path = ltrim(urldecode($url['path']), '/'); $db_path = ltrim(urldecode($url['path']), '/');
$settings_file = './'. conf_path() .'/settings.php'; $settings_file = './'. conf_path() .'/settings.php';
...@@ -132,7 +132,7 @@ function install_change_settings($profile = 'default', $install_locale = '') { ...@@ -132,7 +132,7 @@ function install_change_settings($profile = 'default', $install_locale = '') {
$db_user = urldecode($url['user']); $db_user = urldecode($url['user']);
$db_pass = urldecode($url['pass']); $db_pass = urldecode($url['pass']);
$db_host = urldecode($url['host']); $db_host = urldecode($url['host']);
$db_port = urldecode($url['port']); $db_port = isset($url['port']) ? urldecode($url['port']) : '';
$db_path = ltrim(urldecode($url['path']), '/'); $db_path = ltrim(urldecode($url['path']), '/');
$settings_file = './'. conf_path() .'/settings.php'; $settings_file = './'. conf_path() .'/settings.php';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment