Merge branch 'QA_4_6'

This commit is contained in:
Michal Čihař 2016-04-18 12:16:51 +02:00
commit b5d2334470

View File

@ -176,7 +176,7 @@ class DBIMysqli implements DBIExtension
}
if (! $server) {
$return_value = @$this->_realConnect(
$return_value = $this->_realConnect(
$link,
$cfg['Server']['host'],
$user,
@ -192,7 +192,7 @@ class DBIMysqli implements DBIExtension
&& $cfg['Server']['nopassword']
&& ! $is_controluser
) {
$return_value = @$this->_realConnect(
$return_value = $this->_realConnect(
$link,
$cfg['Server']['host'],
$user,
@ -204,7 +204,7 @@ class DBIMysqli implements DBIExtension
);
}
} else {
$return_value = @$this->_realConnect(
$return_value = $this->_realConnect(
$link,
$server['host'],
$user,