diff --git a/wp-includes/ms-load.php b/wp-includes/ms-load.php index 6e3344e391..64f6b2f784 100644 --- a/wp-includes/ms-load.php +++ b/wp-includes/ms-load.php @@ -395,13 +395,15 @@ function get_site_by_path( $domain, $path, $segments = null ) { function ms_not_installed() { global $wpdb, $domain, $path; + if ( ! is_admin() ) { + dead_db(); + } + wp_load_translations_early(); $title = __( 'Error establishing a database connection' ); + $msg = '

' . $title . '

'; - if ( ! is_admin() ) { - die( $msg ); - } $msg .= '

' . __( 'If your site does not display, please contact the owner of this network.' ) . ''; $msg .= ' ' . __( 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' ) . '

'; $query = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->site ) ); @@ -420,7 +422,7 @@ function ms_not_installed() { } $msg .= ''; - wp_die( $msg, $title ); + wp_die( $msg, $title, array( 'response' => 500 ) ); } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index a552c7ae93..17ca08ac3f 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-alpha-31656'; +$wp_version = '4.2-alpha-31657'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.