X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/f9001779751f83dc8a10e478bfecb4d8dd5f964c..caeaf8dc94b5e3f75dc98ec92dc7b76049cdddb6:/wp-admin/edit-tags.php diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index 0a82e29f..e0cd746e 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -1,16 +1,24 @@ cap->manage_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + +if ( ! $tax ) + wp_die( __( 'Invalid taxonomy' ) ); + +if ( ! current_user_can( $tax->cap->manage_terms ) ) + wp_die( __( 'Cheatin’ uh?' ), 403 ); $wp_list_table = _get_list_table('WP_Terms_List_Table'); $pagenum = $wp_list_table->get_pagenum(); @@ -18,7 +26,7 @@ $pagenum = $wp_list_table->get_pagenum(); $title = $tax->labels->name; if ( 'post' != $post_type ) { - $parent_file = "edit.php?post_type=$post_type"; + $parent_file = ( 'attachment' == $post_type ) ? 'upload.php' : "edit.php?post_type=$post_type"; $submenu_file = "edit-tags.php?taxonomy=$taxonomy&post_type=$post_type"; } else if ( 'link_category' == $tax->name ) { $parent_file = 'link-manager.php'; @@ -28,16 +36,18 @@ if ( 'post' != $post_type ) { $submenu_file = "edit-tags.php?taxonomy=$taxonomy"; } -add_screen_option( 'per_page', array('label' => $title, 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page') ); +add_screen_option( 'per_page', array( 'label' => $title, 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page' ) ); + +$location = false; switch ( $wp_list_table->current_action() ) { case 'add-tag': - check_admin_referer( 'add-tag' ); + check_admin_referer( 'add-tag', '_wpnonce_add-tag' ); if ( !current_user_can( $tax->cap->edit_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); $ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST ); $location = 'edit-tags.php?taxonomy=' . $taxonomy; @@ -53,9 +63,8 @@ case 'add-tag': $location = add_query_arg( 'message', 1, $location ); else $location = add_query_arg( 'message', 4, $location ); - wp_redirect( $location ); - exit; -break; + + break; case 'delete': $location = 'edit-tags.php?taxonomy=' . $taxonomy; @@ -66,30 +75,27 @@ case 'delete': $location = $referer; } - if ( !isset( $_REQUEST['tag_ID'] ) ) { - wp_redirect( $location ); - exit; + if ( ! isset( $_REQUEST['tag_ID'] ) ) { + break; } $tag_ID = (int) $_REQUEST['tag_ID']; - check_admin_referer( 'delete-tag_' . $tag_ID ); + check_admin_referer( 'delete-tag_' . $tag_ID ); if ( !current_user_can( $tax->cap->delete_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); wp_delete_term( $tag_ID, $taxonomy ); $location = add_query_arg( 'message', 2, $location ); - wp_redirect( $location ); - exit; -break; + break; case 'bulk-delete': check_admin_referer( 'bulk-tags' ); if ( !current_user_can( $tax->cap->delete_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); $tags = (array) $_REQUEST['delete_tags']; foreach ( $tags as $tag_ID ) { @@ -105,28 +111,33 @@ case 'bulk-delete': } $location = add_query_arg( 'message', 6, $location ); - wp_redirect( $location ); - exit; -break; + break; case 'edit': $title = $tax->labels->edit_item; - require_once ( 'admin-header.php' ); $tag_ID = (int) $_REQUEST['tag_ID']; $tag = get_term( $tag_ID, $taxonomy, OBJECT, 'edit' ); - include( './edit-tag-form.php' ); + if ( ! $tag ) + wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) ); + require_once( ABSPATH . 'wp-admin/admin-header.php' ); + include( ABSPATH . 'wp-admin/edit-tag-form.php' ); + include( ABSPATH . 'wp-admin/admin-footer.php' ); -break; + exit; case 'editedtag': $tag_ID = (int) $_POST['tag_ID']; check_admin_referer( 'update-tag_' . $tag_ID ); if ( !current_user_can( $tax->cap->edit_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); + + $tag = get_term( $tag_ID, $taxonomy ); + if ( ! $tag ) + wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) ); $ret = wp_update_term( $tag_ID, $taxonomy, $_POST ); @@ -143,18 +154,17 @@ case 'editedtag': $location = add_query_arg( 'message', 3, $location ); else $location = add_query_arg( 'message', 5, $location ); + break; +} - wp_redirect( $location ); - exit; -break; - -default: -if ( ! empty($_REQUEST['_wp_http_referer']) ) { - $location = remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ); - - if ( ! empty( $_REQUEST['paged'] ) ) - $location = add_query_arg( 'paged', (int) $_REQUEST['paged'] ); +if ( ! $location && ! empty( $_REQUEST['_wp_http_referer'] ) ) { + $location = remove_query_arg( array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI']) ); +} +if ( $location ) { + if ( ! empty( $_REQUEST['paged'] ) ) { + $location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location ); + } wp_redirect( $location ); exit; } @@ -176,74 +186,124 @@ if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $t if ( 'category' == $taxonomy ) $help = '
' . sprintf(__( 'You can use categories to define sections of your site and group related posts. The default category is “Uncategorized” until you change it in your writing settings.' ) , 'options-writing.php' ) . '
'; elseif ( 'link_category' == $taxonomy ) - $help = '' . __( 'You can create groups of links by using link categories. Link category names must be unique and link categories are separate from the categories you use for posts.' ) . '
'; + $help = '' . __( 'You can create groups of links by using Link Categories. Link Category names must be unique and Link Categories are separate from the categories you use for posts.' ) . '
'; else - $help = '' . __( 'You can assign keywords to your posts using Post Tags. Unlike categories, tags have no hierarchy, meaning there’s no relationship from one tag to another.' ) . '
'; + $help = '' . __( 'You can assign keywords to your posts using tags. Unlike categories, tags have no hierarchy, meaning there’s no relationship from one tag to another.' ) . '
'; if ( 'link_category' == $taxonomy ) - $help .= '' . __( 'You can delete link categories in the Bulk Action pulldown, but that action does not delete the links within the category. Instead, it moves them to the default link category.' ) . '
'; + $help .= '' . __( 'You can delete Link Categories in the Bulk Action pull-down, but that action does not delete the links within the category. Instead, it moves them to the default Link Category.' ) . '
'; else $help .='' . __( 'What’s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index.' ) . '
'; - if ( 'category' == $taxonomy ) - $help .= '' . __( 'When adding a new category on this screen, you’ll fill in the following fields:' ) . '
'; - elseif ( 'post_tag' == $taxonomy ) - $help .= '' . __( 'When adding a new tag on this screen, you’ll fill in the following fields:' ) . '
'; + get_current_screen()->add_help_tab( array( + 'id' => 'overview', + 'title' => __('Overview'), + 'content' => $help, + ) ); - if ( 'category' == $taxonomy || 'post_tag' == $taxonomy ) + if ( 'category' == $taxonomy || 'post_tag' == $taxonomy ) { + if ( 'category' == $taxonomy ) + $help = '' . __( 'When adding a new category on this screen, you’ll fill in the following fields:' ) . '
'; + else + $help = '' . __( 'When adding a new tag on this screen, you’ll fill in the following fields:' ) . '
'; $help .= '' . __( 'You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table.' ) . '
' . - '' . __( 'For more information:' ) . '
'; + '' . __( 'You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table.' ) . '
'; + + get_current_screen()->add_help_tab( array( + 'id' => 'adding-terms', + 'title' => 'category' == $taxonomy ? __( 'Adding Categories' ) : __( 'Adding Tags' ), + 'content' => $help, + ) ); + } + + $help = '' . __( 'For more information:' ) . '
'; if ( 'category' == $taxonomy ) - $help .= '' . __( 'Documentation on Categories' ) . '
'; + $help .= '' . __( 'Documentation on Categories' ) . '
'; elseif ( 'link_category' == $taxonomy ) - $help .= '' . __( 'Documentation on Link Categories' ) . '
'; + $help .= '' . __( 'Documentation on Link Categories' ) . '
'; else - $help .= '' . __( 'Documentation on Post Tags' ) . '
'; + $help .= '' . __( 'Documentation on Tags' ) . '
'; - $help .= '' . __('Support Forums') . '
'; + $help .= '' . __('Support Forums') . '
'; - add_contextual_help($current_screen, $help); - unset($help); + get_current_screen()->set_help_sidebar( $help ); + + unset( $help ); } -require_once ('admin-header.php'); +require_once( ABSPATH . 'wp-admin/admin-header.php' ); if ( !current_user_can($tax->cap->edit_terms) ) wp_die( __('You are not allowed to edit this item.') ); -$messages[1] = __('Item added.'); -$messages[2] = __('Item deleted.'); -$messages[3] = __('Item updated.'); -$messages[4] = __('Item not added.'); -$messages[5] = __('Item not updated.'); -$messages[6] = __('Items deleted.'); +$messages = array(); +$messages['_item'] = array( + 0 => '', // Unused. Messages start at index 1. + 1 => __( 'Item added.' ), + 2 => __( 'Item deleted.' ), + 3 => __( 'Item updated.' ), + 4 => __( 'Item not added.' ), + 5 => __( 'Item not updated.' ), + 6 => __( 'Items deleted.' ) +); +$messages['category'] = array( + 0 => '', // Unused. Messages start at index 1. + 1 => __( 'Category added.' ), + 2 => __( 'Category deleted.' ), + 3 => __( 'Category updated.' ), + 4 => __( 'Category not added.' ), + 5 => __( 'Category not updated.' ), + 6 => __( 'Categories deleted.' ) +); +$messages['post_tag'] = array( + 0 => '', // Unused. Messages start at index 1. + 1 => __( 'Tag added.' ), + 2 => __( 'Tag deleted.' ), + 3 => __( 'Tag updated.' ), + 4 => __( 'Tag not added.' ), + 5 => __( 'Tag not updated.' ), + 6 => __( 'Tags deleted.' ) +); + +/** + * Filter the messages displayed when a tag is updated. + * + * @since 3.7.0 + * + * @param array $messages The messages to be displayed. + */ +$messages = apply_filters( 'term_updated_messages', $messages ); + +$message = false; +if ( isset( $_REQUEST['message'] ) && ( $msg = (int) $_REQUEST['message'] ) ) { + if ( isset( $messages[ $taxonomy ][ $msg ] ) ) + $message = $messages[ $taxonomy ][ $msg ]; + elseif ( ! isset( $messages[ $taxonomy ] ) && isset( $messages['_item'][ $msg ] ) ) + $message = $messages['_item'][ $msg ]; +} ?>Note:
Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category %s.'), apply_filters('the_category', get_cat_name(get_option('default_category')))) ?>
+ Note:
Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category %s.' ), apply_filters( 'the_category', get_cat_name( get_option( 'default_category') ) ) );
+ ?>
+
category to tag converter.'), 'import.php') ?>
tag to category converter'), 'import.php') ;?>.
+tag to category converter.'), 'import.php') ;?>