X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/d3b1ea255664edd2deef17f900a655613d20820d..58f607a1de715c9bca69340a4d6fb9e1b9c2bed2:/wp-admin/edit-tags.php diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index 9f083b98..057aa489 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -7,57 +7,86 @@ */ /** WordPress Administration Bootstrap */ -require_once('admin.php'); +require_once('./admin.php'); -$title = __('Tags'); - -wp_reset_vars( array('action', 'tag', 'taxonomy') ); +wp_reset_vars( array('action', 'tag', 'taxonomy', 'post_type') ); if ( empty($taxonomy) ) $taxonomy = 'post_tag'; -if ( !is_taxonomy($taxonomy) ) +if ( !taxonomy_exists($taxonomy) ) wp_die(__('Invalid taxonomy')); -$parent_file = 'edit.php'; -$submenu_file = "edit-tags.php?taxonomy=$taxonomy"; +$tax = get_taxonomy($taxonomy); + +if ( ! current_user_can($tax->cap->manage_terms) ) + wp_die(__('Cheatin’ uh?')); + +$title = $tax->labels->name; + +if ( empty($post_type) || !in_array( $post_type, get_post_types( array('public' => true) ) ) ) + $post_type = 'post'; + +if ( 'post' != $post_type ) { + $parent_file = "edit.php?post_type=$post_type"; + $submenu_file = "edit-tags.php?taxonomy=$taxonomy&post_type=$post_type"; +} else { + $parent_file = 'edit.php'; + $submenu_file = "edit-tags.php?taxonomy=$taxonomy"; +} if ( isset( $_GET['action'] ) && isset($_GET['delete_tags']) && ( 'delete' == $_GET['action'] || 'delete' == $_GET['action2'] ) ) $action = 'bulk-delete'; switch($action) { -case 'addtag': +case 'add-tag': check_admin_referer('add-tag'); - if ( !current_user_can('manage_categories') ) + if ( !current_user_can($tax->cap->edit_terms) ) wp_die(__('Cheatin’ uh?')); - $ret = wp_insert_term($_POST['name'], $taxonomy, $_POST); - if ( $ret && !is_wp_error( $ret ) ) { - wp_redirect('edit-tags.php?message=1#addtag'); - } else { - wp_redirect('edit-tags.php?message=4#addtag'); + $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 ( $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; 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 ( !isset( $_GET['tag_ID'] ) ) { + wp_redirect($location); + exit; + } + $tag_ID = (int) $_GET['tag_ID']; check_admin_referer('delete-tag_' . $tag_ID); - if ( !current_user_can('manage_categories') ) + if ( !current_user_can($tax->cap->delete_terms) ) wp_die(__('Cheatin’ uh?')); wp_delete_term( $tag_ID, $taxonomy); - $location = 'edit-tags.php'; - if ( $referer = wp_get_referer() ) { - if ( false !== strpos($referer, 'edit-tags.php') ) - $location = $referer; - } - $location = add_query_arg('message', 2, $location); wp_redirect($location); exit; @@ -67,15 +96,17 @@ break; case 'bulk-delete': check_admin_referer('bulk-tags'); - if ( !current_user_can('manage_categories') ) + if ( !current_user_can($tax->cap->delete_terms) ) wp_die(__('Cheatin’ uh?')); - $tags = $_GET['delete_tags']; - foreach( (array) $tags as $tag_ID ) { + $tags = (array) $_GET['delete_tags']; + foreach( $tags as $tag_ID ) { wp_delete_term( $tag_ID, $taxonomy); } - $location = 'edit-tags.php'; + $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; @@ -88,13 +119,16 @@ case 'bulk-delete': break; case 'edit': - $title = __('Edit Tag'); + $title = $tax->labels->edit_item; require_once ('admin-header.php'); $tag_ID = (int) $_GET['tag_ID']; + if ( !current_user_can($tax->cap->edit_terms) ) + wp_die( __('You are not allowed to edit this item.') ); + $tag = get_term($tag_ID, $taxonomy, OBJECT, 'edit'); - include('edit-tag-form.php'); + include('./edit-tag-form.php'); break; @@ -102,12 +136,15 @@ case 'editedtag': $tag_ID = (int) $_POST['tag_ID']; check_admin_referer('update-tag_' . $tag_ID); - if ( !current_user_can('manage_categories') ) + if ( !current_user_can($tax->cap->edit_terms) ) wp_die(__('Cheatin’ uh?')); $ret = wp_update_term($tag_ID, $taxonomy, $_POST); - $location = 'edit-tags.php'; + $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; @@ -124,44 +161,83 @@ break; default: -if ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) { +if ( ! empty($_GET['_wp_http_referer']) ) { wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) ); exit; } -$can_manage = current_user_can('manage_categories'); - wp_enqueue_script('admin-tags'); -if ( $can_manage ) +if ( current_user_can($tax->cap->edit_terms) ) wp_enqueue_script('inline-edit-tax'); +if ( 'category' == $taxonomy || 'post_tag' == $taxonomy ) { + 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') . '

'; + 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 .='

' . __('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:') . '

'; + 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:') . '

'; + + if ( 'category' == $taxonomy ) + $help .= '

' . __('Categories Documentation') . '

'; + else + $help .= '

' . __('Tags Documentation') . '

'; + + $help .= '

' . __('Support Forums') . '

'; + + add_contextual_help($current_screen, $help); + unset($help); +} + require_once ('admin-header.php'); -$messages[1] = __('Tag added.'); -$messages[2] = __('Tag deleted.'); -$messages[3] = __('Tag updated.'); -$messages[4] = __('Tag not added.'); -$messages[5] = __('Tag not updated.'); -$messages[6] = __('Tags deleted.'); ?> +$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.'); + +?>

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

-

+

+
+

- + - +


@@ -172,24 +248,35 @@ endif; ?>
+
add_query_arg( 'pagenum', '%#%' ), 'format' => '', 'prev_text' => __('«'), 'next_text' => __('»'), - 'total' => ceil(wp_count_terms($taxonomy) / $tags_per_page), + 'total' => ceil(wp_count_terms($taxonomy, array('search' => $searchterms)) / $tags_per_page), 'current' => $pagenum )); @@ -210,27 +297,21 @@ if ( $page_links )
- - + - + - +
@@ -253,53 +334,103 @@ if ( $page_links )
+ + +
+

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') ;?>.

+
+ +
-
-

$taxonomy, 'link' => 'edit')); -else - wp_tag_cloud(array('taxonomy' => $taxonomy)); -?> + +if ( !is_taxonomy_hierarchical($taxonomy) ) { + if ( current_user_can( $tax->cap->edit_terms ) ) + $tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'echo' => false, 'link' => 'edit' ) ); + else + $tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'echo' => false ) ); + + if ( $tag_cloud ) : + ?> +
+

labels->popular_items; ?>

+
+ +if ( current_user_can($tax->cap->edit_terms) ) { + if ( 'category' == $taxonomy ) + do_action('add_category_form_pre', (object)array('parent' => 0) ); // Back compat hook. Deprecated in preference to $taxonomy_pre_add_form + else + do_action('add_tag_form_pre', $taxonomy); // Back compat hook. Applies to all Taxonomies -not- categories + do_action($taxonomy . '_pre_add_form', $taxonomy); +?>
-

-
-
- +

labels->add_new_item; ?>

+ + + - + +
- - -

+ + +

- +
- - + +

- + + +
+ + 0, 'hide_if_empty' => false, 'taxonomy' => $taxonomy, 'name' => 'parent', 'orderby' => 'name', 'hierarchical' => true, 'show_option_none' => __('None'))); ?> + +

+ +
+
- - -

+ + +

-

- + +

+ 0) ); // Back compat hook. Deprecated in preference to $taxonomy_add_form +else + do_action('add_tag_form', $taxonomy); // Back compat hook. Applies to all Taxonomies -not- categories +do_action($taxonomy . '_add_form', $taxonomy); +?>
@@ -309,12 +440,12 @@ else
- +