From 9a4c6dc3dec06932aa4748a9eaae85b044a3fbc6 Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Fri, 22 Apr 2016 05:18:08 +0000 Subject: [PATCH] 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 --- src/wp-includes/wp-db.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/wp-db.php b/src/wp-includes/wp-db.php index 22cd943018..066e851fa3 100644 --- a/src/wp-includes/wp-db.php +++ b/src/wp-includes/wp-db.php @@ -1486,7 +1486,11 @@ class wpdb { } } - mysqli_real_connect( $this->dbh, $host, $this->dbuser, $this->dbpassword, null, $port, $socket, $client_flags ); + if ( WP_DEBUG ) { + 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 ) { $this->dbh = null; @@ -1512,7 +1516,11 @@ class wpdb { } } } else { - $this->dbh = mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags ); + if ( WP_DEBUG ) { + $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 ) {