Changeset 31657

Timestamp:

03/07/2015 05:34:47 AM (9 years ago)

Author:

jeremyfelt

Message:

Return HTTP status code 500 by default in ms_not_installed()

In admin views, specify a response code of 500 when using wp_die() to show an expanded message for a broken or missing multisite installation.

On front end views, use dead_db() rather than die() to generate the generic "Error establishing a database connection" message. dead_db() sets a status code of 500 by default and allows for the override of this generic error with a db-error.php template.

Props craig-ralston, jeremyfelt.

Fixes #30002.

File:

• trunk/src/wp-includes/ms-load.php (modified) (2 diffs)

trunk/src/wp-includes/ms-load.php

@@ -396 +396 @@
     global $wpdb, $domain, $path;
 
+    if ( ! is_admin() ) {
+        dead_db();
+    }
+
     wp_load_translations_early();
 
     $title = __( 'Error establishing a database connection' );
+
     $msg  = '<h1>' . $title . '</h1>';
-    if ( ! is_admin() ) {
-        die( $msg );
-    }
     $msg .= '<p>' . __( '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.' ) . '</p>';
@@ -421 +423 @@
     $msg .= '</ul>';
 
-    wp_die( $msg, $title );
+    wp_die( $msg, $title, array( 'response' => 500 ) );
 }