Commit efb2419d authored by Gábor Hojtsy's avatar Gábor Hojtsy

#194494 by blackdog: fix two noticed on install when password is not provided

parent 1ee3efdf
......@@ -29,7 +29,7 @@ function drupal_test_mysqli($url, &$success) {
// Decode url-encoded information in the db connection string.
$url['user'] = urldecode($url['user']);
$url['pass'] = urldecode($url['pass']);
$url['pass'] = isset($url['pass']) ? urldecode($url['pass']) : NULL;
$url['host'] = urldecode($url['host']);
$url['path'] = urldecode($url['path']);
......
......@@ -155,7 +155,7 @@ function install_verify_settings() {
$url = parse_url(is_array($db_url) ? $db_url['default'] : $db_url);
$db_user = urldecode($url['user']);
$db_pass = urldecode($url['pass']);
$db_pass = isset($url['pass']) ? urldecode($url['pass']) : NULL;
$db_host = urldecode($url['host']);
$db_port = isset($url['port']) ? urldecode($url['port']) : '';
$db_path = ltrim(urldecode($url['path']), '/');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment