X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/f9001779751f83dc8a10e478bfecb4d8dd5f964c..refs/tags/wordpress-4.4:/wp-admin/edit-tags.php diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index 0a82e29f..6ff9e374 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -1,16 +1,40 @@ cap->manage_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + +if ( ! $tax ) + wp_die( __( 'Invalid taxonomy' ) ); + +if ( ! in_array( $tax->name, get_taxonomies( array( 'show_ui' => true ) ) ) ) { + wp_die( __( 'You are not allowed to manage these items.' ) ); +} + +if ( ! current_user_can( $tax->cap->manage_terms ) ) { + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'You are not allowed to manage these items.' ) . '

', + 403 + ); +} + +/** + * $post_type is set when the WP_Terms_List_Table instance is created + * + * @global string $post_type + */ +global $post_type; $wp_list_table = _get_list_table('WP_Terms_List_Table'); $pagenum = $wp_list_table->get_pagenum(); @@ -18,9 +42,9 @@ $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 ) { +} elseif ( 'link_category' == $tax->name ) { $parent_file = 'link-manager.php'; $submenu_file = 'edit-tags.php?taxonomy=link_category'; } else { @@ -28,68 +52,86 @@ 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( 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page' ) ); + +get_current_screen()->set_screen_reader_content( array( + 'heading_pagination' => $tax->labels->items_list_navigation, + 'heading_list' => $tax->labels->items_list, +) ); + +$location = false; +$referer = wp_get_referer(); 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?' ) ); + if ( ! current_user_can( $tax->cap->edit_terms ) ) { + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'You are not allowed to add this item.' ) . '

', + 403 + ); + } $ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST ); $location = 'edit-tags.php?taxonomy=' . $taxonomy; if ( 'post' != $post_type ) $location .= '&post_type=' . $post_type; - if ( $referer = wp_get_original_referer() ) { - if ( false !== strpos( $referer, 'edit-tags.php' ) ) - $location = $referer; + if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) { + $location = $referer; } if ( $ret && !is_wp_error( $ret ) ) $location = add_query_arg( 'message', 1, $location ); else - $location = add_query_arg( 'message', 4, $location ); - wp_redirect( $location ); - exit; -break; + $location = add_query_arg( array( 'error' => true, 'message' => 4 ), $location ); + + break; case 'delete': $location = 'edit-tags.php?taxonomy=' . $taxonomy; if ( 'post' != $post_type ) $location .= '&post_type=' . $post_type; - if ( $referer = wp_get_referer() ) { - if ( false !== strpos( $referer, 'edit-tags.php' ) ) - $location = $referer; + + if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) { + $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 ); - - if ( !current_user_can( $tax->cap->delete_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + check_admin_referer( 'delete-tag_' . $tag_ID ); + + if ( ! current_user_can( $tax->cap->delete_terms ) ) { + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'You are not allowed to delete this item.' ) . '

', + 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?' ) ); + if ( ! current_user_can( $tax->cap->delete_terms ) ) { + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'You are not allowed to delete these items.' ) . '

', + 403 + ); + } $tags = (array) $_REQUEST['delete_tags']; foreach ( $tags as $tag_ID ) { @@ -99,34 +141,43 @@ case 'bulk-delete': $location = 'edit-tags.php?taxonomy=' . $taxonomy; if ( 'post' != $post_type ) $location .= '&post_type=' . $post_type; - if ( $referer = wp_get_referer() ) { - if ( false !== strpos( $referer, 'edit-tags.php' ) ) - $location = $referer; + if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) { + $location = $referer; } $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?' ) ); + if ( ! current_user_can( $tax->cap->edit_terms ) ) { + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'You are not allowed to edit this item.' ) . '

', + 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 ); @@ -134,27 +185,25 @@ case 'editedtag': if ( 'post' != $post_type ) $location .= '&post_type=' . $post_type; - if ( $referer = wp_get_original_referer() ) { - if ( false !== strpos( $referer, 'edit-tags.php' ) ) - $location = $referer; + if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) { + $location = $referer; } if ( $ret && !is_wp_error( $ret ) ) $location = add_query_arg( 'message', 3, $location ); else - $location = add_query_arg( 'message', 5, $location ); - - 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']) ); + $location = add_query_arg( array( 'error' => true, 'message' => 5 ), $location ); + break; +} - 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,79 +225,99 @@ 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') . '

'; + get_current_screen()->set_help_sidebar( $help ); - add_contextual_help($current_screen, $help); - unset($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.') ); +if ( ! current_user_can( $tax->cap->edit_terms ) ) { + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'You are not allowed to edit this item.' ) . '

', + 403 + ); +} + +/** Also used by the Edit Tag form */ +require_once( ABSPATH . 'wp-admin/includes/edit-tag-messages.php' ); + +$class = ( isset( $_REQUEST['error'] ) ) ? 'error' : 'updated'; -$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.'); +if ( is_plugin_active( 'wpcat2tag-importer/wpcat2tag-importer.php' ) ) { + $import_link = admin_url( 'admin.php?import=wpcat2tag' ); +} else { + $import_link = admin_url( 'import.php' ); +} ?>
- -

' . __('Search results for “%s”') . '', esc_html( stripslashes($_REQUEST['s']) ) ); ?> -

+ printf( '' . __('Search results for “%s”') . '', esc_html( wp_unslash($_REQUEST['s']) ) ); ?> + - -

- +

+
-
+ @@ -261,7 +330,7 @@ endif; ?>
- + @@ -272,17 +341,37 @@ endif; ?>
-

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:' ) . '
'; + printf( + /* translators: %s: default category */ + __( '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.' ), + /** This filter is documented in wp-includes/category-template.php */ + '' . apply_filters( 'the_category', get_cat_name( get_option( 'default_category') ) ) . '' + ); + ?> +

-

category to tag converter.'), 'import.php') ?>

+

category to tag converter.' ), esc_url( $import_link ) ) ?>

-

tag to category converter'), 'import.php') ;?>.

+

tag to category converter.' ), esc_url( $import_link ) ) ;?>

@@ -295,14 +384,14 @@ do_action('after-' . $taxonomy . '-table', $taxonomy); if ( !is_null( $tax->labels->popular_items ) ) { if ( current_user_can( $tax->cap->edit_terms ) ) - $tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'echo' => false, 'link' => 'edit' ) ); + $tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'post_type' => $post_type, 'echo' => false, 'link' => 'edit' ) ); else $tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'echo' => false ) ); if ( $tag_cloud ) : ?>
-

labels->popular_items; ?>

+

labels->popular_items; ?>

cap->edit_terms) ) { - // Back compat hooks. Deprecated in preference to {$taxonomy}_pre_add_form - if ( 'category' == $taxonomy ) - do_action('add_category_form_pre', (object)array('parent' => 0) ); - elseif ( 'link_category' == $taxonomy ) - do_action('add_link_category_form_pre', (object)array('parent' => 0) ); - else - do_action('add_tag_form_pre', $taxonomy); + if ( 'category' == $taxonomy ) { + /** + * Fires before the Add Category form. + * + * @since 2.1.0 + * @deprecated 3.0.0 Use {$taxonomy}_pre_add_form instead. + * + * @param object $arg Optional arguments cast to an object. + */ + do_action( 'add_category_form_pre', (object) array( 'parent' => 0 ) ); + } elseif ( 'link_category' == $taxonomy ) { + /** + * Fires before the link category form. + * + * @since 2.3.0 + * @deprecated 3.0.0 Use {$taxonomy}_pre_add_form instead. + * + * @param object $arg Optional arguments cast to an object. + */ + do_action( 'add_link_category_form_pre', (object) array( 'parent' => 0 ) ); + } else { + /** + * Fires before the Add Tag form. + * + * @since 2.5.0 + * @deprecated 3.0.0 Use {$taxonomy}_pre_add_form instead. + * + * @param string $taxonomy The taxonomy slug. + */ + do_action( 'add_tag_form_pre', $taxonomy ); + } - do_action($taxonomy . '_pre_add_form', $taxonomy); + /** + * Fires before the Add Term form for all taxonomies. + * + * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug. + * + * @since 3.0.0 + * + * @param string $taxonomy The taxonomy slug. + */ + do_action( "{$taxonomy}_pre_add_form", $taxonomy ); ?>
-

labels->add_new_item; ?>

- +

labels->add_new_item; ?>

+> - + -
- +
+

-
- +
+

-
- - 0, 'hide_if_empty' => false, 'taxonomy' => $taxonomy, 'name' => 'parent', 'orderby' => 'name', 'hierarchical' => true, 'show_option_none' => __('None'))); ?> +
+ + 0, + 'hide_if_empty' => false, + 'taxonomy' => $taxonomy, + 'name' => 'parent', + 'orderby' => 'name', + 'hierarchical' => true, + 'show_option_none' => __( 'None' ), + ); + + /** + * Filter the taxonomy parent drop-down on the Edit Term page. + * + * @since 3.7.0 + * @since 4.2.0 Added `$context` parameter. + * + * @param array $dropdown_args { + * An array of taxonomy parent drop-down arguments. + * + * @type int|bool $hide_empty Whether to hide terms not attached to any posts. Default 0|false. + * @type bool $hide_if_empty Whether to hide the drop-down if no terms exist. Default false. + * @type string $taxonomy The taxonomy slug. + * @type string $name Value of the name attribute to use for the drop-down select element. + * Default 'parent'. + * @type string $orderby The field to order by. Default 'name'. + * @type bool $hierarchical Whether the taxonomy is hierarchical. Default true. + * @type string $show_option_none Label to display if there are no terms. Default 'None'. + * } + * @param string $taxonomy The taxonomy slug. + * @param string $context Filter context. Accepts 'new' or 'edit'. + */ + $dropdown_args = apply_filters( 'taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'new' ); + + wp_dropdown_categories( $dropdown_args ); + ?>

-
- +
+

labels->add_new_item, 'button' ); +if ( ! is_taxonomy_hierarchical( $taxonomy ) ) { + /** + * Fires after the Add Tag form fields for non-hierarchical taxonomies. + * + * @since 3.0.0 + * + * @param string $taxonomy The taxonomy slug. + */ + do_action( 'add_tag_form_fields', $taxonomy ); +} -// Back compat hooks. Deprecated in preference to {$taxonomy}_add_form -if ( 'category' == $taxonomy ) - do_action('edit_category_form', (object)array('parent' => 0) ); -elseif ( 'link_category' == $taxonomy ) - do_action('edit_link_category_form', (object)array('parent' => 0) ); -else - do_action('add_tag_form', $taxonomy); +/** + * Fires after the Add Term form fields. + * + * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug. + * + * @since 3.0.0 + * + * @param string $taxonomy The taxonomy slug. + */ +do_action( "{$taxonomy}_add_form_fields", $taxonomy ); + +submit_button( $tax->labels->add_new_item ); + +if ( 'category' == $taxonomy ) { + /** + * Fires at the end of the Edit Category form. + * + * @since 2.1.0 + * @deprecated 3.0.0 Use {$taxonomy}_add_form instead. + * + * @param object $arg Optional arguments cast to an object. + */ + do_action( 'edit_category_form', (object) array( 'parent' => 0 ) ); +} elseif ( 'link_category' == $taxonomy ) { + /** + * Fires at the end of the Edit Link form. + * + * @since 2.3.0 + * @deprecated 3.0.0 Use {$taxonomy}_add_form instead. + * + * @param object $arg Optional arguments cast to an object. + */ + do_action( 'edit_link_category_form', (object) array( 'parent' => 0 ) ); +} else { + /** + * Fires at the end of the Add Tag form. + * + * @since 2.7.0 + * @deprecated 3.0.0 Use {$taxonomy}_add_form instead. + * + * @param string $taxonomy The taxonomy slug. + */ + do_action( 'add_tag_form', $taxonomy ); +} -do_action($taxonomy . '_add_form', $taxonomy); +/** + * Fires at the end of the Add Term form for all taxonomies. + * + * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug. + * + * @since 3.0.0 + * + * @param string $taxonomy The taxonomy slug. + */ +do_action( "{$taxonomy}_add_form", $taxonomy ); ?>
@@ -383,12 +601,13 @@ do_action($taxonomy . '_add_form', $taxonomy);
-inline_edit(); ?> - + + inline_edit(); -?> +include( ABSPATH . 'wp-admin/admin-footer.php' );