Changeset 27279

Timestamp:

02/26/2014 04:53:21 AM (12 years ago)

Author:

nacin

Message:

When failing to reconnect to a server that has gone away, simply fail the query once we've passed template_redirect, rather than wp_die().

props pento.
see #5932.

File:

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

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

@@ -970 +970 @@
                 if ( ! $success ) {
                         $this->ready = false;
-                        wp_load_translations_early();
-                        $this->bail( sprintf( __( '<h1>Can&#8217;t select database</h1>
+                        if ( ! did_action( 'template_redirect' ) ) {
+                                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>
@@ -979 +980 @@
 </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;
                 }
@@ -1379 +1381 @@
          * 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, or if after the
+         * the template_redirect hook has been fired, return false instead.
          *
          * @since 3.9.0
@@ -1420 +1423 @@
 
                         sleep( 1 );
+                }
+
+                // If template_redirect has already happened, it's too late for wp_die()/dead_db().
+                // Let's just return and hope for the best.
+                if ( did_action( 'template_redirect' ) ) {
+                        return false;
                 }
 
@@ -1487 +1496 @@
                         if ( $this->check_connection() ) {
                                 $this->_do_query( $query );
+                        } else {
+                                $this->insert_id = 0;
+                                return false;
                         }
                 }