diff options
| author | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-09-16 19:26:22 +0000 |
|---|---|---|
| committer | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-09-16 19:26:22 +0000 |
| commit | a28ee0cceb976992734eeed21e61692bf3718f38 (patch) | |
| tree | 93b92ff354e7a3d413d5ba247b58bfd6d77810ce | |
| parent | d662bd20fd88a3fb9b18e0befc7fa4583768d2bc (diff) | |
| download | brdo-a28ee0cceb976992734eeed21e61692bf3718f38.tar.gz brdo-a28ee0cceb976992734eeed21e61692bf3718f38.tar.bz2 | |
#81332 by wundo and davemicc. Allow empty MySQL passwords to work.
| -rw-r--r-- | includes/database.mysql.inc | 8 | ||||
| -rw-r--r-- | includes/database.mysqli.inc | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/includes/database.mysql.inc b/includes/database.mysql.inc index 79f95331e..421ccbeb5 100644 --- a/includes/database.mysql.inc +++ b/includes/database.mysql.inc @@ -56,7 +56,13 @@ function db_connect($url) { // Decode url-encoded information in the db connection string $url['user'] = urldecode($url['user']); - $url['pass'] = urldecode($url['pass']); + // Test if database url has a password. + if(isset($url['pass'])) { + $url['pass'] = urldecode($url['pass']); + } + else { + $url['pass'] = ''; + } $url['host'] = urldecode($url['host']); $url['path'] = urldecode($url['path']); diff --git a/includes/database.mysqli.inc b/includes/database.mysqli.inc index 9c6da5888..de2c36af8 100644 --- a/includes/database.mysqli.inc +++ b/includes/database.mysqli.inc @@ -57,7 +57,13 @@ function db_connect($url) { // Decode url-encoded information in the db connection string $url['user'] = urldecode($url['user']); - $url['pass'] = urldecode($url['pass']); + // Test if database url has a password. + if(isset($url['pass'])) { + $url['pass'] = urldecode($url['pass']); + } + else { + $url['pass'] = ''; + } $url['host'] = urldecode($url['host']); $url['path'] = urldecode($url['path']); |