Skip to content

Commit 4247d56

Browse files
author
Till Brehm
committed
Merge branch 'ebela-develop-patch-18090' into 'develop'
Fix. See merge request ispconfig/ispconfig3!1632
2 parents 29da1d4 + 13ce33c commit 4247d56

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

server/lib/classes/db_mysql.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function __construct($host = NULL , $user = NULL, $pass = NULL, $database
7777
$this->dbPort = $port ? $port : $conf['db_port'];
7878
$this->dbName = $database ? $database : $conf['db_database'];
7979
$this->dbUser = $user ? $user : $conf['db_user'];
80-
$this->dbPass = $pass ? $pass : $conf['db_password'];
80+
$this->dbPass = ( $pass !== NULL ) ? $pass : $conf['db_password'];
8181
$this->dbCharset = $conf['db_charset'];
8282
$this->dbClientFlags = ($flags !== NULL) ? $flags : $conf['db_client_flags'];
8383
$this->_iConnId = mysqli_init();

0 commit comments

Comments
 (0)