Ticket #5932: 5932.9.diff

src/wp-includes/wp-db.php

@@ -966 +966 @@
                 }
                 if ( ! $success ) {
                         $this->ready = false;
-                        wp_load_translations_early();
-                        $this->bail( sprintf( __( '<h1>Can&#8217;t select database</h1>
+                        if ( ! did_action( 'wp_head' ) ) {
+                                wp_load_translations_early();
+                                $this->bail( sprintf( __( '<h1>Can&#8217;t select database</h1>
 <p>We were able to connect to the database server (which means your username and password is okay) but not able to select the <code>%1$s</code> database.</p>
 <ul>
 <li>Are you sure it exists?</li>
@@ -975 +976 @@
 <li>On some systems the name of your database is prefixed with your username, so it would be like <code>username_%1$s</code>. Could that be the problem?</li>
 </ul>
 <p>If you don\'t know how to set up a database you should <strong>contact your host</strong>. If all else fails you may find help at the <a href="http://wordpress.org/support/">WordPress Support Forums</a>.</p>' ), htmlspecialchars( $db, ENT_QUOTES ), htmlspecialchars( $this->dbuser, ENT_QUOTES ) ), 'db_select_fail' );
+                        }
                         return;
                 }
         }
@@ -1371 +1373 @@
         /**
          * Check that the connection to the database is still up. If not, try to reconnect.
          *
-         * If this function is unable to reconnect, it will forcibly die.
+         * If this function is unable to reconnect, it will forcibly die before wp_head has been
+         * triggered, or return false after wp_head has been triggered.
          *
          * @since 3.9.0
          *
@@ -1414 +1417 @@
                         sleep( 1 );
                 }
 
+                // If wp_head has already happened, wp_die()/dead_db() won't work properly,
+                // so let's just return and hope for the best.
+                if ( did_action( 'wp_head' ) ) {
+                        return false;
+                }
+
                 // We weren't able to reconnect, so we better bail.
                 $this->bail( sprintf( ( "
 <h1>Error reconnecting to the database</h1>
@@ -1479 +1488 @@
                 if ( empty( $this->dbh ) || 2006 == $mysql_errno ) {
                         if ( $this->check_connection() ) {
                                 $this->_do_query( $query );
+                        } else {
+                                $this->insert_id = 0;
+                                return false;
                         }
                 }