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-admin | |
| 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-admin')
| -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 |
7 files changed, 14 insertions, 14 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" ) ); |