Show
Ignore:
Timestamp:
09/13/07 06:23:23 (1 year 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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-settings.php

    r6108 r6110  
    114114if ( !defined('PLUGINDIR') ) 
    115115    define('PLUGINDIR', 'wp-content/plugins'); // no leading slash, no trailing slash 
     116 
     117require (ABSPATH . WPINC . '/compat.php'); 
     118require (ABSPATH . WPINC . '/functions.php'); 
     119 
    116120if ( file_exists(ABSPATH . 'wp-content/db.php') ) 
    117121    require_once (ABSPATH . 'wp-content/db.php'); 
    …… 
    123127 
    124128if ( preg_match('|[^a-z0-9_]|i', $wpdb->prefix) && !file_exists(ABSPATH . 'wp-content/db.php') ) 
    125     die("<strong>ERROR</strong>: <code>$table_prefix</code> in <code>wp-config.php</code> can only contain numbers, letters, and underscores."); 
     129    wp_die("<strong>ERROR</strong>: <code>$table_prefix</code> in <code>wp-config.php</code> can only contain numbers, letters, and underscores."); 
    126130 
    127131// Table names 
    …… 
    151155 
    152156wp_cache_init(); 
    153  
    154 require (ABSPATH . WPINC . '/compat.php'); 
    155 require (ABSPATH . WPINC . '/functions.php'); 
    156157 
    157158require (ABSPATH . WPINC . '/classes.php');