summaryrefslogtreecommitdiff
path: root/includes/database.mysql.inc
diff options
context:
space:
mode:
authorGábor Hojtsy <gabor@hojtsy.hu>2008-01-23 09:59:29 +0000
committerGábor Hojtsy <gabor@hojtsy.hu>2008-01-23 09:59:29 +0000
commitff4fd98430669b6355d91c2a5042b116d840d3da (patch)
tree8d6357b1832f7d72fdf94d48a80de699f2f886a6 /includes/database.mysql.inc
parent97a97554f1879816007d7509281b947fa0f03adc (diff)
downloadbrdo-ff4fd98430669b6355d91c2a5042b116d840d3da.tar.gz
brdo-ff4fd98430669b6355d91c2a5042b116d840d3da.tar.bz2
#194494 by Jax, slightly expanded: unify empty password handling is MySQL and MySQLi installer and runtime drivers
Diffstat (limited to 'includes/database.mysql.inc')
-rw-r--r--includes/database.mysql.inc7
1 files changed, 1 insertions, 6 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']);