diff options
| -rw-r--r-- | wp-admin/bookmarklet.php | 2 | ||||
| -rw-r--r-- | wp-admin/categories.php | 6 | ||||
| -rw-r--r-- | wp-admin/link.php | 6 | ||||
| -rw-r--r-- | wp-admin/moderation.php | 8 | ||||
| -rw-r--r-- | wp-admin/options.php | 2 | ||||
| -rw-r--r-- | wp-admin/sidebar.php | 2 | ||||
| -rw-r--r-- | wp-admin/update-links.php | 2 | ||||
| -rw-r--r-- | wp-includes/functions.php | 99 | ||||
| -rw-r--r-- | wp-mail.php | 6 |
9 files changed, 62 insertions, 71 deletions
diff --git a/wp-admin/bookmarklet.php b/wp-admin/bookmarklet.php index 4345340..04e13cd 100644 --- a/wp-admin/bookmarklet.php +++ b/wp-admin/bookmarklet.php @@ -3,7 +3,7 @@ $mode = 'bookmarklet'; require_once('admin.php'); if ( ! current_user_can('edit_posts') ) - die ("Cheatin' uh?"); + wp_die(__('Cheatin’ uh?')); if ('b' == $a): ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> diff --git a/wp-admin/categories.php b/wp-admin/categories.php index cdfae6c..87e5e20 100644 --- a/wp-admin/categories.php +++ b/wp-admin/categories.php @@ -13,7 +13,7 @@ case 'addcat': check_admin_referer('add-category'); if ( !current_user_can('manage_categories') ) - die (__('Cheatin’ uh?')); + wp_die(__('Cheatin’ uh?')); wp_insert_category($_POST); @@ -25,7 +25,7 @@ case 'delete': check_admin_referer('delete-category_' . $cat_ID); if ( !current_user_can('manage_categories') ) - die (__('Cheatin’ uh?')); + wp_die(__('Cheatin’ uh?')); $cat_name = get_catname($cat_ID); @@ -56,7 +56,7 @@ case 'editedcat': check_admin_referer('update-category_' . $cat_ID); if ( !current_user_can('manage_categories') ) - die (__('Cheatin’ uh?')); + wp_die(__('Cheatin’ uh?')); wp_update_category($_POST); diff --git a/wp-admin/link.php b/wp-admin/link.php index 00a281b..0590f16 100644 --- a/wp-admin/link.php +++ b/wp-admin/link.php @@ -18,7 +18,7 @@ switch ($action) { // check the current user's level first. if (!current_user_can('manage_links')) - wp_die(__("Cheatin' uh ?")); + wp_die(__('Cheatin’ uh?')); //for each link id (in $linkcheck[]) change category to selected value if (count($linkcheck) == 0) { @@ -42,7 +42,7 @@ switch ($action) { // check the current user's level first. if (!current_user_can('manage_links')) - wp_die(__("Cheatin' uh ?")); + wp_die(__('Cheatin’ uh?')); //for each link id (in $linkcheck[]) change category to selected value if (count($linkcheck) == 0) { @@ -79,7 +79,7 @@ switch ($action) { check_admin_referer('delete-bookmark_' . $link_id); if (!current_user_can('manage_links')) - wp_die(__("Cheatin' uh ?")); + wp_die(__('Cheatin’ uh?')); wp_delete_link($link_id); diff --git a/wp-admin/moderation.php b/wp-admin/moderation.php index 2a32435..799fd0d 100644 --- a/wp-admin/moderation.php +++ b/wp-admin/moderation.php @@ -143,10 +143,10 @@ $post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title; ?> <a href="<?php echo get_permalink($comment->comment_post_ID); ?>" title="<?php echo $post_title; ?>"><?php _e('View Post') ?></a> ] — <?php _e('Bulk action:') ?> - <input type="radio" name="comment[<?php echo $comment->comment_ID; ?>]" id="comment-<?php echo $comment->comment_ID; ?>-approve" value="approve" /> <label for="comment[<?php echo $comment->comment_ID; ?>]-approve"><?php _e('Approve') ?></label> - <input type="radio" name="comment[<?php echo $comment->comment_ID; ?>]" id="comment-<?php echo $comment->comment_ID; ?>-spam" value="spam" /> <label for="comment[<?php echo $comment->comment_ID; ?>]-spam"><?php _e('Spam') ?></label> - <input type="radio" name="comment[<?php echo $comment->comment_ID; ?>]" id="comment-<?php echo $comment->comment_ID; ?>-delete" value="delete" /> <label for="comment[<?php echo $comment->comment_ID; ?>]-delete"><?php _e('Delete') ?></label> - <input type="radio" name="comment[<?php echo $comment->comment_ID; ?>]" id="comment-<?php echo $comment->comment_ID; ?>-nothing" value="later" checked="checked" /> <label for="comment[<?php echo $comment->comment_ID; ?>]-nothing"><?php _e('Defer until later') ?></label> + <input type="radio" name="comment[<?php echo $comment->comment_ID; ?>]" id="comment-<?php echo $comment->comment_ID; ?>-approve" value="approve" /> <label for="comment-<?php echo $comment->comment_ID; ?>-approve"><?php _e('Approve') ?></label> + <input type="radio" name="comment[<?php echo $comment->comment_ID; ?>]" id="comment-<?php echo $comment->comment_ID; ?>-spam" value="spam" /> <label for="comment-<?php echo $comment->comment_ID; ?>-spam"><?php _e('Spam') ?></label> + <input type="radio" name="comment[<?php echo $comment->comment_ID; ?>]" id="comment-<?php echo $comment->comment_ID; ?>-delete" value="delete" /> <label for="comment-<?php echo $comment->comment_ID; ?>-delete"><?php _e('Delete') ?></label> + <input type="radio" name="comment[<?php echo $comment->comment_ID; ?>]" id="comment-<?php echo $comment->comment_ID; ?>-nothing" value="later" checked="checked" /> <label for="comment-<?php echo $comment->comment_ID; ?>-nothing"><?php _e('Defer until later') ?></label> </p> </li> diff --git a/wp-admin/options.php b/wp-admin/options.php index 097db91..8528d18 100644 --- a/wp-admin/options.php +++ b/wp-admin/options.php @@ -8,7 +8,7 @@ $parent_file = 'options-general.php'; wp_reset_vars(array('action')); if ( !current_user_can('manage_options') ) - die ( __('Cheatin’ uh?') ); + wp_die(__('Cheatin’ uh?')); if( $_GET[ 'adminhash' ] ) { $new_admin_details = get_option( 'new_admin_email' ); diff --git a/wp-admin/sidebar.php b/wp-admin/sidebar.php index 1c1832a..256c1a2 100644 --- a/wp-admin/sidebar.php +++ b/wp-admin/sidebar.php @@ -4,7 +4,7 @@ $mode = 'sidebar'; require_once('admin.php'); if ( ! current_user_can('edit_posts') ) - die ("Cheatin' uh ?"); + wp_die(__('Cheatin’ uh?')); if ('b' == $_GET['a']) { diff --git a/wp-admin/update-links.php b/wp-admin/update-links.php index e2aa540..4aa8a84 100644 --- a/wp-admin/update-links.php +++ b/wp-admin/update-links.php @@ -8,7 +8,7 @@ if ( !get_option('use_linksupdate') ) $link_uris = $wpdb->get_col("SELECT link_url FROM $wpdb->links"); if ( !$link_uris ) - wp_die('No links'); + wp_die(__('No links')); $link_uris = urlencode( join( $link_uris, "\n" ) ); 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(); } diff --git a/wp-mail.php b/wp-mail.php index 7ab76f8..920beff 100644 --- a/wp-mail.php +++ b/wp-mail.php @@ -11,10 +11,8 @@ $phone_delim = '::'; $pop3 = new POP3(); -if (!$pop3->connect(get_settings('mailserver_url'), get_settings('mailserver_port'))) : - echo "Ooops $pop3->ERROR <br />\n"; - exit; -endif; +if (!$pop3->connect(get_settings('mailserver_url'), get_settings('mailserver_port'))) + wp_die($pop3->ERROR); $count = $pop3->login(get_settings('mailserver_login'), get_settings('mailserver_pass')); if (0 == $count) wp_die(__('There doesn’t seem to be any new mail.')); |