From ff4fd98430669b6355d91c2a5042b116d840d3da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= <gabor@hojtsy.hu>
Date: Wed, 23 Jan 2008 09:59:29 +0000
Subject: [PATCH] #194494 by Jax, slightly expanded: unify empty password
handling is MySQL and MySQLi installer and runtime drivers
---
includes/database.mysql.inc | 7 +------
includes/database.mysqli.inc | 7 +------
includes/install.mysql.inc | 2 +-
includes/install.mysqli.inc | 2 +-
4 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/includes/database.mysql.inc b/includes/database.mysql.inc
index 01eb22befcc5..0b2636c66cd7 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 1919991459d9..47390eb8e67b 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 fa3b6d857dca..dc268525c00e 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 12fc2b6cfea7..6de5fd26332f 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']);
--
GitLab