WordPress.org

Make WordPress Core

Changeset 6110


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

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/functions.php

    r6108 r6110  
    12411241        $admin_dir = 'wp-admin/'; 
    12421242 
    1243     if ( !did_action('admin_head') ) : 
     1243    if ( !function_exists('did_action') || !did_action('admin_head') ) : 
     1244    status_header(500); 
     1245    nocache_headers(); 
    12441246    header('Content-Type: text/html; charset=utf-8'); 
    12451247 
    1246     if ( empty($title) ) 
    1247         $title = __('WordPress › Error'); 
    1248  
    1249  
     1248    if ( empty($title) ){ 
     1249        if( function_exists('__') ) 
     1250            $title = __('WordPress › Error'); 
     1251        else 
     1252            $title = 'WordPress › Error'; 
     1253    } 
    12501254 
    12511255?> 
  • trunk/wp-includes/wp-db.php

    r6046 r6110  
    402402        if ( !$this->show_errors ) 
    403403            return false; 
    404  
    405         header('Content-Type: text/html; charset=utf-8'); 
    406  
    407         if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) 
    408             $admin_dir = ''; 
    409         else 
    410             $admin_dir = 'wp-admin/'; 
    411  
    412 ?> 
    413 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
    414 <html xmlns="http://www.w3.org/1999/xhtml"> 
    415 <head> 
    416     <title>WordPress &rsaquo; Error</title> 
    417     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
    418     <link rel="stylesheet" href="<?php echo $admin_dir; ?>install.css" type="text/css" /> 
    419 </head> 
    420 <body> 
    421     <h1 id="logo"><img alt="WordPress" src="<?php echo $admin_dir; ?>images/wordpress-logo.png" /></h1> 
    422     <p><?php echo $message; ?></p> 
    423 </body> 
    424 </html> 
    425 <?php 
    426         die(); 
     404        wp_die($message); 
    427405    } 
    428406} 
  • 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'); 
Note: See TracChangeset for help on using the changeset viewer.