Index: src/wp-includes/functions.php
===================================================================
--- src/wp-includes/functions.php (revision 27018)
+++ src/wp-includes/functions.php (working copy)
@@ -2793,6 +2793,8 @@
function dead_db() {
global $wpdb;
+ 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' );
@@ -2807,8 +2809,6 @@
status_header( 500 );
nocache_headers();
header( 'Content-Type: text/html; charset=utf-8' );
-
- wp_load_translations_early();
?>
>
Index: src/wp-includes/wp-db.php
===================================================================
--- src/wp-includes/wp-db.php (revision 27018)
+++ src/wp-includes/wp-db.php (working copy)
@@ -1154,6 +1154,13 @@
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( __( "
Error establishing a database connection
This either means that the username and password information in your wp-config.php file is incorrect or we can't contact the database server at %s. This could mean your host's database server is down.