summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--includes/install.mysqli.inc2
-rw-r--r--install.php2
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']), '/');