4 files changed, 4 insertions, 14 deletions
diff --git a/includes/database.mysql.inc b/includes/database.mysql.inc
index 01eb22bef..0b2636c66 100644
--- a/includes/database.mysql.inc
+++ b/includes/database.mysql.inc
@@ -59,12 +59,7 @@ function db_connect($url) {
   // Decode url-encoded information in the db connection string
   $url['user'] = urldecode($url['user']);
   // Test if database url has a password.
-  if (isset($url['pass'])) {
-    $url['pass'] = urldecode($url['pass']);
-  }
-  else {
-    $url['pass'] = '';
-  }
+  $url['pass'] = isset($url['pass']) ? urldecode($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 191999145..47390eb8e 100644
--- a/includes/database.mysqli.inc
+++ b/includes/database.mysqli.inc
@@ -65,12 +65,7 @@ function db_connect($url) {
   // Decode url-encoded information in the db connection string
   $url['user'] = urldecode($url['user']);
   // Test if database url has a password.
-  if (isset($url['pass'])) {
-    $url['pass'] = urldecode($url['pass']);
-  }
-  else {
-    $url['pass'] = '';
-  }
+  $url['pass'] = isset($url['pass']) ? urldecode($url['pass']) : '';
   $url['host'] = urldecode($url['host']);
   $url['path'] = urldecode($url['path']);
   if (!isset($url['port'])) {
diff --git a/includes/install.mysql.inc b/includes/install.mysql.inc
index fa3b6d857..dc268525c 100644
--- a/includes/install.mysql.inc
+++ b/includes/install.mysql.inc
@@ -29,7 +29,7 @@ function drupal_test_mysql($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']) : '';
   $url['host'] = urldecode($url['host']);
   $url['path'] = urldecode($url['path']);
 
diff --git a/includes/install.mysqli.inc b/includes/install.mysqli.inc
index 12fc2b6cf..6de5fd263 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'] = isset($url['pass']) ? urldecode($url['pass']) : NULL;
+  $url['pass'] = isset($url['pass']) ? urldecode($url['pass']) : '';
   $url['host'] = urldecode($url['host']);
   $url['path'] = urldecode($url['path']);