$tax = get_taxonomy( $taxonomy );
- if ( empty( $post_type ) || !in_array( $post_type, get_post_types( array( 'public' => true ) ) ) )
+ if ( empty( $post_type ) || !in_array( $post_type, get_post_types( array( 'show_ui' => true ) ) ) )
$post_type = 'post';
parent::__construct( array(
function prepare_items() {
global $taxonomy;
- $tags_per_page = $this->get_items_per_page( 'edit_' . $taxonomy . '_per_page' );
+ $tags_per_page = $this->get_items_per_page( 'edit_' . $taxonomy . '_per_page' );
if ( 'post_tag' == $taxonomy ) {
$tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page );
}
function get_columns() {
- global $taxonomy, $typenow;
+ global $taxonomy, $post_type;
$columns = array(
'cb' => '<input type="checkbox" />',
if ( 'link_category' == $taxonomy ) {
$columns['links'] = __( 'Links' );
} else {
- $post_type = empty( $typenow ) ? 'post' : $typenow;
$post_type_object = get_post_type_object( $post_type );
$columns['posts'] = $post_type_object ? $post_type_object->labels->name : __( 'Posts' );
}
$tax = get_taxonomy( $taxonomy );
- if ( ! $tax->public )
+ $ptype_object = get_post_type_object( $post_type );
+ if ( ! $ptype_object->show_ui )
return $count;
if ( $tax->query_var ) {
$args = array( 'taxonomy' => $tax->name, 'term' => $tag->slug );
}
- $args['post_type'] = $post_type;
+ if ( 'post' != $post_type )
+ $args['post_type'] = $post_type;
return "<a href='" . esc_url ( add_query_arg( $args, 'edit.php' ) ) . "'>$count</a>";
}
* @since 3.1.0
*/
function inline_edit() {
- global $tax;
+ global $post_type, $tax;
if ( ! current_user_can( $tax->cap->edit_terms ) )
return;
?>
<p class="inline-edit-save submit">
- <a accesskey="c" href="#inline-edit" title="<?php _e( 'Cancel' ); ?>" class="cancel button-secondary alignleft"><?php _e( 'Cancel' ); ?></a>
+ <a accesskey="c" href="#inline-edit" title="<?php esc_attr_e( 'Cancel' ); ?>" class="cancel button-secondary alignleft"><?php _e( 'Cancel' ); ?></a>
<?php $update_text = $tax->labels->update_item; ?>
<a accesskey="s" href="#inline-edit" title="<?php echo esc_attr( $update_text ); ?>" class="save button-primary alignright"><?php echo $update_text; ?></a>
<img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
<span class="error" style="display:none;"></span>
<?php wp_nonce_field( 'taxinlineeditnonce', '_inline_edit', false ); ?>
<input type="hidden" name="taxonomy" value="<?php echo esc_attr( $tax->name ); ?>" />
+ <input type="hidden" name="post_type" value="<?php echo esc_attr( $post_type ); ?>" />
<br class="clear" />
</p>
</td></tr>
<?php
}
}
-
-?>