Database: Suppress connection error messages when `WP_DEBUG` isn't enabled.
This is a partial revert of [35860], which has been causing un-catchable warnings to be generated on some server configurations. Fixes #36629 for trunk. See #21870. git-svn-id: https://develop.svn.wordpress.org/trunk@37292 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
153610292d
commit
9a4c6dc3de
|
@ -1486,7 +1486,11 @@ class wpdb {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( WP_DEBUG ) {
|
||||||
mysqli_real_connect( $this->dbh, $host, $this->dbuser, $this->dbpassword, null, $port, $socket, $client_flags );
|
mysqli_real_connect( $this->dbh, $host, $this->dbuser, $this->dbpassword, null, $port, $socket, $client_flags );
|
||||||
|
} else {
|
||||||
|
@mysqli_real_connect( $this->dbh, $host, $this->dbuser, $this->dbpassword, null, $port, $socket, $client_flags );
|
||||||
|
}
|
||||||
|
|
||||||
if ( $this->dbh->connect_errno ) {
|
if ( $this->dbh->connect_errno ) {
|
||||||
$this->dbh = null;
|
$this->dbh = null;
|
||||||
|
@ -1512,7 +1516,11 @@ class wpdb {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
if ( WP_DEBUG ) {
|
||||||
$this->dbh = mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags );
|
$this->dbh = mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags );
|
||||||
|
} else {
|
||||||
|
$this->dbh = @mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( ! $this->dbh && $allow_bail ) {
|
if ( ! $this->dbh && $allow_bail ) {
|
||||||
|
|
Loading…
Reference in New Issue