Changeset 6110 for trunk/wp-settings.php

Timestamp:

09/13/2007 06:23:23 AM (19 years ago)

Author:

markjaquith

Message:

Use wp_die() for WPDB bails. Send 500 response and no-cache headers so wp_die()s are not cached. props DD32. fixes #3471

File:

• trunk/wp-settings.php (modified) (3 diffs)

trunk/wp-settings.php

@@ -114 +114 @@
 if ( !defined('PLUGINDIR') )
         define('PLUGINDIR', 'wp-content/plugins'); // no leading slash, no trailing slash
+
+require (ABSPATH . WPINC . '/compat.php');
+require (ABSPATH . WPINC . '/functions.php');
+
 if ( file_exists(ABSPATH . 'wp-content/db.php') )
         require_once (ABSPATH . 'wp-content/db.php');
@@ -123 +127 @@
 
 if ( preg_match('|[^a-z0-9_]|i', $wpdb->prefix) && !file_exists(ABSPATH . 'wp-content/db.php') )
-        die("<strong>ERROR</strong>: <code>$table_prefix</code> in <code>wp-config.php</code> can only contain numbers, letters, and underscores.");
+        wp_die("<strong>ERROR</strong>: <code>$table_prefix</code> in <code>wp-config.php</code> can only contain numbers, letters, and underscores.");
 
 // Table names
@@ -151 +155 @@
 
 wp_cache_init();
-
-require (ABSPATH . WPINC . '/compat.php');
-require (ABSPATH . WPINC . '/functions.php');
 
 require (ABSPATH . WPINC . '/classes.php');