#194494 by blackdog: fix two noticed on install when password is not provided
parent
1ee3efdf55
commit
efb2419db3
|
@ -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']), '/');
|
||||
|
|
Loading…
Reference in New Issue