diff options
| author | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-12-19 11:25:47 +0000 |
|---|---|---|
| committer | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-12-19 11:25:47 +0000 |
| commit | efb2419db30f930e6358a4c1ff40bca39866e5fe (patch) | |
| tree | e0a9d3718b554368df9523e08f4aecd180313afb | |
| parent | 1ee3efdf5507343bf84e45255d0a9173d1bebb91 (diff) | |
| download | brdo-efb2419db30f930e6358a4c1ff40bca39866e5fe.tar.gz brdo-efb2419db30f930e6358a4c1ff40bca39866e5fe.tar.bz2 | |
#194494 by blackdog: fix two noticed on install when password is not provided
| -rw-r--r-- | includes/install.mysqli.inc | 2 | ||||
| -rw-r--r-- | install.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/includes/install.mysqli.inc b/includes/install.mysqli.inc index 1a73ad292..12fc2b6cf 100644 --- a/includes/install.mysqli.inc +++ b/includes/install.mysqli.inc @@ -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']); diff --git a/install.php b/install.php index 65fc3903f..98df16bb4 100644 --- a/install.php +++ b/install.php @@ -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']), '/'); |