diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-07-11 09:05:58 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-07-11 09:05:58 +0000 |
| commit | be846080ae26c7358610f85a75034425a39b0dff (patch) | |
| tree | 5accb8da9682bfbc61763c1220f0e8fa3a496a6e /wp-includes/functions.php | |
| parent | cd78f6c49a3370eea1df8fb85d84ac7ac58fe1d5 (diff) | |
| download | wordpress-mu-be846080ae26c7358610f85a75034425a39b0dff.tar.gz wordpress-mu-be846080ae26c7358610f85a75034425a39b0dff.tar.xz wordpress-mu-be846080ae26c7358610f85a75034425a39b0dff.zip | |
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@645 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/functions.php')
| -rw-r--r-- | wp-includes/functions.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wp-includes/functions.php b/wp-includes/functions.php index e7c0302..cf981ec 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -1127,7 +1127,6 @@ function wp_nonce_ays($action) { $adminurl = wp_get_referer(); $title = __('WordPress Confirmation'); - require_once(ABSPATH . '/wp-admin/admin-header.php'); // Remove extra layer of slashes. $_POST = stripslashes_deep($_POST ); if ( $_POST ) { @@ -1145,18 +1144,19 @@ function wp_nonce_ays($action) { $html .= "\t<div id='message' class='confirm fade'>\n\t<p>" . wp_explain_nonce($action) . "</p>\n\t<p><a href='$adminurl'>" . __('No') . "</a> <a href='" . add_query_arg( '_wpnonce', wp_create_nonce($action), $_SERVER['REQUEST_URI'] ) . "'>" . __('Yes') . "</a></p>\n\t</div>\n"; } $html .= "</body>\n</html>"; - echo $html; - include_once(ABSPATH . '/wp-admin/admin-footer.php'); + wp_die($html, $title); } -function wp_die($message) { +function wp_die($message, $title = '') { header('Content-Type: text/html; charset=utf-8'); + if ( empty($title) ) + $title = __('WordPress › Error'); ?> <!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> + <title><?php echo $title ?></title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <style media="screen" type="text/css"> <!-- |