Changeset 27056 for trunk/src/wp-includes/wp-db.php

Timestamp:

01/29/2014 05:27:24 AM (11 years ago)

Author:

wonderboymusic

Message:

In wpdb::db_connect(), allow the loading of a custom database error template - this is already allowed in dead_db().

In dead_db(), move the call to wp_load_translations_early() before the inclusion of the db-error.php file to allow translation in both locations before the template is loaded.

Props sbruner, kovshenin.
Fixes #25703.

File:

• trunk/src/wp-includes/wp-db.php (modified) (1 diff)

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

@@ -1155 +1155 @@
         if ( !$this->dbh ) {
             wp_load_translations_early();
+
+            // Load custom DB error template, if present.
+            if ( file_exists( WP_CONTENT_DIR . '/db-error.php' ) ) {
+                require_once( WP_CONTENT_DIR . '/db-error.php' );
+                die();
+            }
+
             $this->bail( sprintf( __( "
 <h1>Error establishing a database connection</h1>