Changeset 42716

Timestamp:

02/15/2018 02:28:13 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Database: If both WP_DEBUG and WP_DEBUG_DISPLAY are true, display a more specific error message in wpdb::bail().

Props sivel, Mte90, SergeyBiryukov.
Fixes #13657.

File:

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

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

@@ -3317 +3317 @@
      */
     public function bail( $message, $error_code = '500' ) {
-        if ( ! $this->show_errors ) {
+        if ( $this->show_errors ) {
+            $error = '';
+
+            if ( $this->use_mysqli ) {
+                if ( $this->dbh instanceof mysqli ) {
+                    $error = mysqli_error( $this->dbh );
+                } elseif ( mysqli_connect_errno() ) {
+                    $error = mysqli_connect_error();
+                }
+            } else {
+                if ( is_resource( $this->dbh ) ) {
+                    $error = mysql_error( $this->dbh );
+                } else {
+                    $error = mysql_error();
+                }
+            }
+
+            if ( $error ) {
+                $message = '<p><code>' . $error . "</code></p>\n" . $message;
+            }
+
+            wp_die( $message );
+        } else {
             if ( class_exists( 'WP_Error', false ) ) {
                 $this->error = new WP_Error( $error_code, $message );
@@ -3323 +3345 @@
                 $this->error = $message;
             }
+
             return false;
         }
-        wp_die( $message );
     }