$title = __('Tags');
-wp_reset_vars( array('action', 'tag') );
+wp_reset_vars( array('action', 'tag', 'taxonomy') );
+
+if ( empty($taxonomy) )
+ $taxonomy = 'post_tag';
+
+if ( !is_taxonomy($taxonomy) )
+ wp_die(__('Invalid taxonomy'));
+
+$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') )
wp_die(__('Cheatin’ uh?'));
- $ret = wp_insert_term($_POST['name'], 'post_tag', $_POST);
+ $ret = wp_insert_term($_POST['tag-name'], $taxonomy, $_POST);
if ( $ret && !is_wp_error( $ret ) ) {
wp_redirect('edit-tags.php?message=1#addtag');
} else {
break;
case 'delete':
+ if ( !isset( $_GET['tag_ID'] ) ) {
+ wp_redirect("edit-tags.php?taxonomy=$taxonomy");
+ exit;
+ }
+
$tag_ID = (int) $_GET['tag_ID'];
check_admin_referer('delete-tag_' . $tag_ID);
if ( !current_user_can('manage_categories') )
wp_die(__('Cheatin’ uh?'));
- wp_delete_term( $tag_ID, 'post_tag');
+ wp_delete_term( $tag_ID, $taxonomy);
+
+ $location = 'edit-tags.php';
+ if ( $referer = wp_get_referer() ) {
+ if ( false !== strpos($referer, 'edit-tags.php') )
+ $location = $referer;
+ }
- wp_redirect('edit-tags.php?message=2');
+ $location = add_query_arg('message', 2, $location);
+ wp_redirect($location);
exit;
break;
if ( !current_user_can('manage_categories') )
wp_die(__('Cheatin’ uh?'));
- $tags = $_GET['delete_tags'];
- foreach( (array) $tags as $tag_ID ) {
- wp_delete_term( $tag_ID, 'post_tag');
+ $tags = (array) $_GET['delete_tags'];
+ foreach( $tags as $tag_ID ) {
+ wp_delete_term( $tag_ID, $taxonomy);
}
$location = 'edit-tags.php';
require_once ('admin-header.php');
$tag_ID = (int) $_GET['tag_ID'];
- $tag = get_term($tag_ID, 'post_tag', OBJECT, 'edit');
+ $tag = get_term($tag_ID, $taxonomy, OBJECT, 'edit');
include('edit-tag-form.php');
break;
if ( !current_user_can('manage_categories') )
wp_die(__('Cheatin’ uh?'));
- $ret = wp_update_term($tag_ID, 'post_tag', $_POST);
+ $ret = wp_update_term($tag_ID, $taxonomy, $_POST);
$location = 'edit-tags.php';
if ( $referer = wp_get_original_referer() ) {
<div class="wrap nosubsub">
<?php screen_icon(); ?>
-<h2><?php echo wp_specialchars( $title );
+<h2><?php echo esc_html( $title );
if ( isset($_GET['s']) && $_GET['s'] )
- printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', wp_specialchars( stripslashes($_GET['s']) ) ); ?>
+ printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', esc_html( stripslashes($_GET['s']) ) ); ?>
</h2>
<?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
<div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div>
<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
endif; ?>
+<div id="ajax-response"></div>
<form class="search-form" action="" method="get">
+<input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
<p class="search-box">
- <label class="hidden" for="tag-search-input"><?php _e( 'Search Tags' ); ?>:</label>
- <input type="text" class="search-input" id="tag-search-input" name="s" value="<?php _admin_search_query(); ?>" />
- <input type="submit" value="<?php _e( 'Search Tags' ); ?>" class="button" />
+ <label class="screen-reader-text" for="tag-search-input"><?php _e( 'Search Tags' ); ?>:</label>
+ <input type="text" id="tag-search-input" name="s" value="<?php _admin_search_query(); ?>" />
+ <input type="submit" value="<?php esc_attr_e( 'Search Tags' ); ?>" class="button" />
</p>
</form>
<br class="clear" />
<div id="col-right">
<div class="col-wrap">
<form id="posts-filter" action="" method="get">
+<input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
<div class="tablenav">
<?php
$pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0;
if ( empty($pagenum) )
$pagenum = 1;
-$tagsperpage = apply_filters("tagsperpage",20);
+$tags_per_page = (int) get_user_option( 'edit_tags_per_page', 0, false );
+if ( empty($tags_per_page) || $tags_per_page < 1 )
+ $tags_per_page = 20;
+$tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page );
+$tags_per_page = apply_filters( 'tagsperpage', $tags_per_page ); // Old filter
$page_links = paginate_links( array(
'base' => add_query_arg( 'pagenum', '%#%' ),
'format' => '',
'prev_text' => __('«'),
'next_text' => __('»'),
- 'total' => ceil(wp_count_terms('post_tag') / $tagsperpage),
+ 'total' => ceil(wp_count_terms($taxonomy) / $tags_per_page),
'current' => $pagenum
));
<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
<option value="delete"><?php _e('Delete'); ?></option>
</select>
-<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
+<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
<?php wp_nonce_field('bulk-tags'); ?>
</div>
$searchterms = isset( $_GET['s'] ) ? trim( $_GET['s'] ) : '';
-$count = tag_rows( $pagenum, $tagsperpage, $searchterms );
+$count = tag_rows( $pagenum, $tags_per_page, $searchterms, $taxonomy );
?>
</tbody>
</table>
<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
<option value="delete"><?php _e('Delete'); ?></option>
</select>
-<input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
+<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
</div>
<br class="clear" />
<h3><?php _e('Popular Tags'); ?></h3>
<?php
if ( $can_manage )
- wp_tag_cloud(array('link' => 'edit'));
+ wp_tag_cloud(array('taxonomy' => $taxonomy, 'link' => 'edit'));
else
- wp_tag_cloud();
+ wp_tag_cloud(array('taxonomy' => $taxonomy));
?>
</div>
<div class="form-wrap">
<h3><?php _e('Add a New Tag'); ?></h3>
-<div id="ajax-response"></div>
-<form name="addtag" id="addtag" method="post" action="edit-tags.php" class="add:the-list: validate">
-<input type="hidden" name="action" value="addtag" />
-<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('add-tag'); ?>
+<form id="addtag" method="post" action="edit-tags.php" class="validate">
+<input type="hidden" name="action" value="add-tag" />
+<input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
+<?php wp_nonce_field('add-tag'); ?>
<div class="form-field form-required">
- <label for="name"><?php _e('Tag name') ?></label>
- <input name="name" id="name" type="text" value="" size="40" aria-required="true" />
- <p><?php _e('The name is how the tag appears on your site.'); ?></p>
+ <label for="tag-name"><?php _e('Tag name') ?></label>
+ <input name="tag-name" id="tag-name" type="text" value="" size="40" aria-required="true" />
+
<p><?php _e('The name is how the tag appears on your site.'); ?></p>
</div>
<div class="form-field">
<label for="slug"><?php _e('Tag slug') ?></label>
<input name="slug" id="slug" type="text" value="" size="40" />
- <p><?php _e('The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p>
+
<p><?php _e('The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p>
</div>
-<p class="submit"><input type="submit" class="button" name="submit" value="<?php _e('Add Tag'); ?>" /></p>
+<div class="form-field">
+ <label for="description"><?php _e('Description') ?></label>
+ <textarea name="description" id="description" rows="5" cols="40"></textarea>
+ <p><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p>
+</div>
+
+<p class="submit"><input type="submit" class="button" name="submit" id="submit" value="<?php esc_attr_e('Add Tag'); ?>" /></p>
<?php do_action('add_tag_form'); ?>
</form></div>
<?php } ?>
</div><!-- /col-container -->
</div><!-- /wrap -->
-<script type="text/javascript">
-/* <![CDATA[ */
-(function($){
- $(document).ready(function(){
- $('#doaction, #doaction2').click(function(){
- if ( $('select[name^="action"]').val() == 'delete' ) {
- var m = '<?php echo js_escape(__("You are about to delete the selected tags.\n 'Cancel' to stop, 'OK' to delete.")); ?>';
- return showNotice.warn(m);
- }
- });
- });
-})(jQuery);
-/* ]]> */
-</script>
-
<?php inline_edit_term_row('edit-tags'); ?>
<?php
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff