Changeset 37548

Timestamp:

05/24/2016 05:23:06 AM (10 years ago)

Author:

pento

Message:

Database: Don't generate unnecessary warnings in wpdb::query().

In the event that the database has gone away for some reason, calls to mysqli_errno() and mysqli_error() (and their ext/mysql equivalents, of course), will generate PHP warnings, which are unsightly, and not how we do things in these parts.

Props mbijon, craig-ralston for the original patch.

Fixes #23085.

File:

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

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

@@ -1720 +1720 @@
                 $this->check_current_query = true;
 
-                // Keep track of the last query for debug..
+                // Keep track of the last query for debug.
                 $this->last_query = $query;
 
                 $this->_do_query( $query );
 
-                // MySQL server has gone away, try to reconnect
+                // MySQL server has gone away, try to reconnect.
                 $mysql_errno = 0;
                 if ( ! empty( $this->dbh ) ) {
                         if ( $this->use_mysqli ) {
-                                $mysql_errno = mysqli_errno( $this->dbh );
+                                if ( $this->dbh instanceof mysqli ) {
+                                        $mysql_errno = mysqli_errno( $this->dbh );
+                                } else {
+                                        // $dbh is defined, but isn't a real connection.
+                                        // Something has gone horribly wrong, let's try a reconnect.
+                                        $mysql_errno = 2006;
+                                }
                         } else {
-                                $mysql_errno = mysql_errno( $this->dbh );
+                                if ( is_resource( $this->dbh ) ) {
+                                        $mysql_errno = mysql_errno( $this->dbh );
+                                } else {
+                                        $mysql_errno = 2006;
+                                }
                         }
                 }
@@ -1744 +1754 @@
                 }
 
-                // If there is an error then take note of it..
+                // If there is an error then take note of it.
                 if ( $this->use_mysqli ) {
-                        $this->last_error = mysqli_error( $this->dbh );
+                        if ( $this->dbh instanceof mysqli ) {
+                                $this->last_error = mysqli_error( $this->dbh );
+                        } else {
+                                $this->last_error = __( 'Unable to retrieve the error message from MySQL' );
+                        }
                 } else {
-                        $this->last_error = mysql_error( $this->dbh );
+                        if ( is_resource( $this->dbh ) ) {
+                                $this->last_error = mysql_error( $this->dbh );
+                        } else {
+                                $this->last_error = __( 'Unable to retrieve the error message from MySQL' );
+                        }
                 }