diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index e2f9e6b5f..b8b9ed371 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -45,17 +45,33 @@ case 'add-tag': wp_die(__('Cheatin’ uh?')); $ret = wp_insert_term($_POST['tag-name'], $taxonomy, $_POST); - if ( $ret && !is_wp_error( $ret ) ) { - wp_redirect("edit-tags.php?taxonomy=$taxonomy&message=1#addtag"); - } else { - wp_redirect("edit-tags.php?taxonomy=$taxonomy&message=4#addtag"); + $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); 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("edit-tags.php?taxonomy=$taxonomy"); + wp_redirect($location); exit; } @@ -67,12 +83,6 @@ case 'delete': wp_delete_term( $tag_ID, $taxonomy); - $location = 'edit-tags.php?taxonomy=' . $taxonomy; - 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; @@ -91,6 +101,8 @@ 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; @@ -123,6 +135,9 @@ case 'editedtag': $ret = wp_update_term($tag_ID, $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; diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index de675959f..d5792cc97 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -452,25 +452,29 @@ function wp_link_category_checklist( $link_id = 0 ) { * @return unknown */ function _tag_row( $tag, $level, $taxonomy = 'post_tag' ) { + global $post_type; static $row_class = ''; $row_class = ($row_class == '' ? ' class="alternate"' : ''); $count = number_format_i18n( $tag->count ); - if ( 'post_tag' == $taxonomy ) - $tagsel = 'tag'; - elseif ( 'category' == $taxonomy ) - $tagsel = 'category_name'; - else - $tagsel = $taxonomy; - $tax = get_taxonomy($taxonomy); - $count = ( $count > 0 ) ? "$count" : $count; + if ( 'post_tag' == $taxonomy ) { + $tagsel = 'tag'; + } elseif ( 'category' == $taxonomy ) { + $tagsel = 'category_name'; + } elseif ( ! empty($tax->query_var) ) { + $tagsel = $tax->query_var; + } else { + $tagsel = $taxonomy; + } + + $count = ( $count > 0 ) ? "$count" : $count; $pad = str_repeat( '— ', max(0, $level) ); $name = apply_filters( 'term_name', $pad . ' ' . $tag->name, $tag ); $qe_data = get_term($tag->term_id, $taxonomy, object, 'edit'); - $edit_link = "edit-tags.php?action=edit&taxonomy=$taxonomy&tag_ID=$tag->term_id"; + $edit_link = "edit-tags.php?action=edit&taxonomy=$taxonomy&post_type=$post_type&tag_ID=$tag->term_id"; $out = ''; $out .= '