diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-07-10 10:47:01 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-07-10 10:47:01 +0000 |
| commit | cd78f6c49a3370eea1df8fb85d84ac7ac58fe1d5 (patch) | |
| tree | 53bd8d95a76a07be91ef04a35370d4ddf0d176d3 /wp-includes | |
| parent | c5580572a15003e3c2fb1d9cbd7c2baafe14bb5a (diff) | |
| download | wordpress-mu-cd78f6c49a3370eea1df8fb85d84ac7ac58fe1d5.tar.gz wordpress-mu-cd78f6c49a3370eea1df8fb85d84ac7ac58fe1d5.tar.xz wordpress-mu-cd78f6c49a3370eea1df8fb85d84ac7ac58fe1d5.zip | |
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@644 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes')
| -rw-r--r-- | wp-includes/functions.php | 99 |
1 files changed, 46 insertions, 53 deletions
diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 294d469..e7c0302 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -1150,65 +1150,58 @@ function wp_nonce_ays($action) { } function wp_die($message) { - global $wpdb; - - if ( !$wpdb->show_errors ) - return false; header('Content-Type: text/html; charset=utf-8'); - $output = <<<HEAD - <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - <html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <title>WordPress › Error</title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <style media="screen" type="text/css"> - <!-- - html { - background: #eee; - } - body { - background: #fff; - color: #000; - font-family: Georgia, "Times New Roman", Times, serif; - margin-left: 25%; - margin-right: 25%; - padding: .2em 2em; - } +?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <title>WordPress › <?php _e('Error'); ?></title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <style media="screen" type="text/css"> + <!-- + html { + background: #eee; + } + body { + background: #fff; + color: #000; + font-family: Georgia, "Times New Roman", Times, serif; + margin-left: 25%; + margin-right: 25%; + padding: .2em 2em; + } - h1 { - color: #006; - font-size: 18px; - font-weight: lighter; - } + h1 { + color: #006; + font-size: 18px; + font-weight: lighter; + } - h2 { - font-size: 16px; - } + h2 { + font-size: 16px; + } - p, li, dt { - line-height: 140%; - padding-bottom: 2px; - } + p, li, dt { + line-height: 140%; + padding-bottom: 2px; + } - ul, ol { - padding: 5px 5px 5px 20px; - } - #logo { - margin-bottom: 2em; - } - --> - </style> - </head> - <body> - <h1 id="logo"><img alt="WordPress" src="../wp-admin/images/wordpress-logo.png" /></h1> - <p>$message</p> - </body> - </html> -HEAD; - - $output = apply_filters('wp_die', $output, $message); - echo $output; + ul, ol { + padding: 5px 5px 5px 20px; + } + #logo { + margin-bottom: 2em; + } + --> + </style> +</head> +<body> + <h1 id="logo"><img alt="WordPress" src="<?php echo get_settings('siteurl'); ?>/wp-admin/images/wordpress-logo.png" /></h1> + <p><?php echo $message; ?></p> +</body> +</html> +<?php die(); } |