Skip to content
Snippets Groups Projects
Commit 4247d56e authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'ebela-develop-patch-18090' into 'develop'

Fix.

See merge request ispconfig/ispconfig3!1632
parents 29da1d4d 13ce33c9
No related branches found
No related tags found
No related merge requests found
...@@ -77,7 +77,7 @@ class db ...@@ -77,7 +77,7 @@ class db
$this->dbPort = $port ? $port : $conf['db_port']; $this->dbPort = $port ? $port : $conf['db_port'];
$this->dbName = $database ? $database : $conf['db_database']; $this->dbName = $database ? $database : $conf['db_database'];
$this->dbUser = $user ? $user : $conf['db_user']; $this->dbUser = $user ? $user : $conf['db_user'];
$this->dbPass = $pass ? $pass : $conf['db_password']; $this->dbPass = ( $pass !== NULL ) ? $pass : $conf['db_password'];
$this->dbCharset = $conf['db_charset']; $this->dbCharset = $conf['db_charset'];
$this->dbClientFlags = ($flags !== NULL) ? $flags : $conf['db_client_flags']; $this->dbClientFlags = ($flags !== NULL) ? $flags : $conf['db_client_flags'];
$this->_iConnId = mysqli_init(); $this->_iConnId = mysqli_init();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment