From ae4cedc61a7f10ac247c8d4869075ad5106e5f0f Mon Sep 17 00:00:00 2001 From: ryan Date: Wed, 5 Jul 2006 19:13:26 +0000 Subject: [PATCH] Die with style. Props Sewar. fixes #2902 git-svn-id: http://svn.automattic.com/wordpress/trunk@3979 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/admin.php | 2 +- wp-includes/functions.php | 64 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/wp-admin/admin.php b/wp-admin/admin.php index 68e627c86..b5ea5af0c 100644 --- a/wp-admin/admin.php +++ b/wp-admin/admin.php @@ -5,7 +5,7 @@ else require_once('../wp-config.php'); if ( get_option('db_version') != $wp_db_version ) - die (sprintf(__("Your database is out-of-date. Please upgrade."), get_option('siteurl') . '/wp-admin/upgrade.php')); + wp_die(sprintf(__("Your database is out-of-date. Please upgrade."), get_option('siteurl') . '/wp-admin/upgrade.php')); require_once(ABSPATH . 'wp-admin/admin-functions.php'); require_once(ABSPATH . 'wp-admin/admin-db.php'); diff --git a/wp-includes/functions.php b/wp-includes/functions.php index f1c324372..b0e389e9c 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -1115,4 +1115,68 @@ function wp_nonce_ays($action) { include_once(ABSPATH . '/wp-admin/admin-footer.php'); } +function wp_die($message) { + global $wpdb; + + if ( !$wpdb->show_errors ) + return false; + header('Content-Type: text/html; charset=utf-8'); + + $output = << + + + WordPress › Error + + + + +

WordPress

+

$message

+ + +HEAD; + + $output = apply_filters('wp_die', $output, $message); + echo $output; + + die(); +} + ?>