From a28ee0cceb976992734eeed21e61692bf3718f38 Mon Sep 17 00:00:00 2001 From: Neil Drumm Date: Sat, 16 Sep 2006 19:26:22 +0000 Subject: #81332 by wundo and davemicc. Allow empty MySQL passwords to work. --- includes/database.mysql.inc | 8 +++++++- includes/database.mysqli.inc | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'includes') 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']); -- cgit v1.2.3