Changeset 35860

Timestamp:

12/11/2015 03:39:52 AM (9 years ago)

Author:

ericlewis

Message:

Don't suppress error messages in database function calls.

Fixes #21870.

File:

• trunk/src/wp-includes/wp-db.php (modified) (7 diffs)

trunk/src/wp-includes/wp-db.php

@@ -1045 +1045 @@
 
         if ( $this->use_mysqli ) {
-            $success = @mysqli_select_db( $dbh, $db );
+            $success = mysqli_select_db( $dbh, $db );
         } else {
-            $success = @mysql_select_db( $db, $dbh );
+            $success = mysql_select_db( $db, $dbh );
         }
         if ( ! $success ) {
@@ -1485 +1485 @@
             }
 
-            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 );
-            }
+            mysqli_real_connect( $this->dbh, $host, $this->dbuser, $this->dbpassword, null, $port, $socket, $client_flags );
 
             if ( $this->dbh->connect_errno ) {
@@ -1515 +1511 @@
             }
         } else {
-            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 );
-            }
+            $this->dbh = mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags );
         }
 
@@ -1590 +1582 @@
     public function check_connection( $allow_bail = true ) {
         if ( $this->use_mysqli ) {
-            if ( @mysqli_ping( $this->dbh ) ) {
+            if ( ! empty( $this->dbh ) && mysqli_ping( $this->dbh ) ) {
                 return true;
             }
         } else {
-            if ( @mysql_ping( $this->dbh ) ) {
+            if ( ! empty( $this->dbh ) && mysql_ping( $this->dbh ) ) {
                 return true;
             }
@@ -1771 +1763 @@
             $num_rows = 0;
             if ( $this->use_mysqli && $this->result instanceof mysqli_result ) {
-                while ( $row = @mysqli_fetch_object( $this->result ) ) {
+                while ( $row = mysqli_fetch_object( $this->result ) ) {
                     $this->last_result[$num_rows] = $row;
                     $num_rows++;
                 }
             } elseif ( is_resource( $this->result ) ) {
-                while ( $row = @mysql_fetch_object( $this->result ) ) {
+                while ( $row = mysql_fetch_object( $this->result ) ) {
                     $this->last_result[$num_rows] = $row;
                     $num_rows++;
@@ -1806 +1798 @@
         }
 
-        if ( $this->use_mysqli ) {
-            $this->result = @mysqli_query( $this->dbh, $query );
-        } else {
-            $this->result = @mysql_query( $query, $this->dbh );
+        if ( ! empty( $this->dbh ) && $this->use_mysqli ) {
+            $this->result = mysqli_query( $this->dbh, $query );
+        } elseif ( ! empty( $this->dbh ) ) {
+            $this->result = mysql_query( $query, $this->dbh );
         }
         $this->num_queries++;
@@ -3017 +3009 @@
 
         if ( $this->use_mysqli ) {
-            $num_fields = @mysqli_num_fields( $this->result );
+            $num_fields = mysqli_num_fields( $this->result );
             for ( $i = 0; $i < $num_fields; $i++ ) {
-                $this->col_info[ $i ] = @mysqli_fetch_field( $this->result );
+                $this->col_info[ $i ] = mysqli_fetch_field( $this->result );
             }
         } else {
-            $num_fields = @mysql_num_fields( $this->result );
+            $num_fields = mysql_num_fields( $this->result );
             for ( $i = 0; $i < $num_fields; $i++ ) {
-                $this->col_info[ $i ] = @mysql_fetch_field( $this->result, $i );
+                $this->col_info[ $i ] = mysql_fetch_field( $this->result, $i );
             }
         }