From b45e9069274dea9c7581b9410a3a0271c24be656 Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Fri, 22 Apr 2016 05:19:27 +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. Built from https://develop.svn.wordpress.org/trunk@37292 git-svn-id: http://core.svn.wordpress.org/trunk@37258 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/version.php | 2 +- wp-includes/wp-db.php | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/wp-includes/version.php b/wp-includes/version.php index 6332759b58..7c62e45b39 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.6-alpha-37288'; +$wp_version = '4.6-alpha-37292'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php index 22cd943018..066e851fa3 100644 --- a/wp-includes/wp-db.php +++ b/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 ) {