Changeset 37293

Timestamp:

04/22/2016 05:23:40 AM (10 years ago)

Author:

pento

Message:

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.

Merge of [37292] to the 4.5 branch.

Fixes #36629.
See #21870.

File:

• branches/4.5/src/wp-includes/wp-db.php (modified) (2 diffs)

branches/4.5/src/wp-includes/wp-db.php

@@ -1487 +1487 @@
                         }
 
-                        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 ) {
@@ -1513 +1517 @@
                         }
                 } 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 );
+                        }
                 }