WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add WP_Error handling to wp_die(). Props mdawaffe. fixes #3791 

git-svn-id: http://svn.automattic.com/wordpress/trunk@4892 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2007-02-20 01:24:31 +00:00
parent 4280a27b44
commit a4d57ead4c
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
wp-includes/functions.php
View File

@ -1293,9 +1293,31 @@ function wp_nonce_ays($action) {
wp_die($html, $title); wp_die($html, $title);
} }
function wp_die($message, $title = '') { function wp_die( $message, $title = '' ) {
global $wp_locale; global $wp_locale;
if ( is_wp_error( $message ) ) {
if ( empty($title) ) {
$error_data = $message->get_error_data();
if ( is_array($error_data) && isset($error_data['title']) )
$title = $error_data['title'];
}
$errors = $message->get_error_messages();
switch ( count($errors) ) :
case 0 :
$message = '';
break;
case 1 :
$message = "<p>{$errors[0]}</p>";
break;
default :
$message = "<ul>\n\t\t<li>" . join( "</li>\n\t\t<li>", $errors ) . "</li>\n\t</ul>";
break;
endswitch;
} elseif ( is_string($message) ) {
$message = "<p>$message</p>";
}
header('Content-Type: text/html; charset=utf-8'); header('Content-Type: text/html; charset=utf-8');
if ( empty($title) ) if ( empty($title) )
@ -1319,11 +1341,11 @@ function wp_die($message, $title = '') {
</head> </head>
<body> <body>
<h1 id="logo"><img alt="WordPress" src="<?php echo $admin_dir; ?>images/wordpress-logo.png" /></h1> <h1 id="logo"><img alt="WordPress" src="<?php echo $admin_dir; ?>images/wordpress-logo.png" /></h1>
<p><?php echo $message; ?></p> <?php echo $message; ?>
</body> </body>
</html> </html>
<?php <?php
die(); die();
} }