X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/8f374b7233bc2815ccc387e448d208c5434eb961..6c8f14c09105d0afa4c1574215c59b5021040e76:/wp-admin/includes/class-wp-terms-list-table.php
diff --git a/wp-admin/includes/class-wp-terms-list-table.php b/wp-admin/includes/class-wp-terms-list-table.php
index b398a55c..85010105 100644
--- a/wp-admin/includes/class-wp-terms-list-table.php
+++ b/wp-admin/includes/class-wp-terms-list-table.php
@@ -11,43 +11,44 @@ class WP_Terms_List_Table extends WP_List_Table {
var $callback_args;
- function __construct() {
- global $post_type, $taxonomy, $tax;
+ function __construct( $args = array() ) {
+ global $post_type, $taxonomy, $action, $tax;
- wp_reset_vars( array( 'action', 'taxonomy', 'post_type' ) );
+ parent::__construct( array(
+ 'plural' => 'tags',
+ 'singular' => 'tag',
+ 'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
+ ) );
+
+ $action = $this->screen->action;
+ $post_type = $this->screen->post_type;
+ $taxonomy = $this->screen->taxonomy;
if ( empty( $taxonomy ) )
$taxonomy = 'post_tag';
- if ( !taxonomy_exists( $taxonomy ) )
+ if ( ! taxonomy_exists( $taxonomy ) )
wp_die( __( 'Invalid taxonomy' ) );
$tax = get_taxonomy( $taxonomy );
+ // @todo Still needed? Maybe just the show_ui part.
if ( empty( $post_type ) || !in_array( $post_type, get_post_types( array( 'show_ui' => true ) ) ) )
$post_type = 'post';
- parent::__construct( array(
- 'plural' => 'tags',
- 'singular' => 'tag',
- ) );
}
function ajax_user_can() {
- global $tax;
-
- return current_user_can( $tax->cap->manage_terms );
+ return current_user_can( get_taxonomy( $this->screen->taxonomy )->cap->manage_terms );
}
function prepare_items() {
- global $taxonomy;
+ $tags_per_page = $this->get_items_per_page( 'edit_' . $this->screen->taxonomy . '_per_page' );
- $tags_per_page = $this->get_items_per_page( 'edit_' . $taxonomy . '_per_page' );
-
- if ( 'post_tag' == $taxonomy ) {
+ if ( 'post_tag' == $this->screen->taxonomy ) {
$tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page );
$tags_per_page = apply_filters( 'tagsperpage', $tags_per_page ); // Old filter
- } elseif ( 'category' == $taxonomy ) {
+ } elseif ( 'category' == $this->screen->taxonomy ) {
$tags_per_page = apply_filters( 'edit_categories_per_page', $tags_per_page ); // Old filter
}
@@ -68,7 +69,7 @@ class WP_Terms_List_Table extends WP_List_Table {
$this->callback_args = $args;
$this->set_pagination_args( array(
- 'total_items' => wp_count_terms( $taxonomy, compact( 'search' ) ),
+ 'total_items' => wp_count_terms( $this->screen->taxonomy, compact( 'search' ) ),
'per_page' => $tags_per_page,
) );
}
@@ -93,8 +94,6 @@ class WP_Terms_List_Table extends WP_List_Table {
}
function get_columns() {
- global $taxonomy, $post_type;
-
$columns = array(
'cb' => '',
'name' => _x( 'Name', 'term name' ),
@@ -102,10 +101,10 @@ class WP_Terms_List_Table extends WP_List_Table {
'slug' => __( 'Slug' ),
);
- if ( 'link_category' == $taxonomy ) {
+ if ( 'link_category' == $this->screen->taxonomy ) {
$columns['links'] = __( 'Links' );
} else {
- $post_type_object = get_post_type_object( $post_type );
+ $post_type_object = get_post_type_object( $this->screen->post_type );
$columns['posts'] = $post_type_object ? $post_type_object->labels->name : __( 'Posts' );
}
@@ -123,7 +122,7 @@ class WP_Terms_List_Table extends WP_List_Table {
}
function display_rows_or_placeholder() {
- global $taxonomy;
+ $taxonomy = $this->screen->taxonomy;
$args = wp_parse_args( $this->callback_args, array(
'page' => 1,
@@ -231,25 +230,25 @@ class WP_Terms_List_Table extends WP_List_Table {
}
function column_cb( $tag ) {
- global $taxonomy, $tax;
+ $default_term = get_option( 'default_' . $this->screen->taxonomy );
- $default_term = get_option( 'default_' . $taxonomy );
+ if ( current_user_can( get_taxonomy( $this->screen->taxonomy )->cap->delete_terms ) && $tag->term_id != $default_term )
+ return ''
+ . '';
- if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term )
- return '';
- else
- return ' ';
+ return ' ';
}
function column_name( $tag ) {
- global $taxonomy, $tax, $post_type;
+ $taxonomy = $this->screen->taxonomy;
+ $tax = get_taxonomy( $taxonomy );
$default_term = get_option( 'default_' . $taxonomy );
$pad = str_repeat( '— ', max( 0, $this->level ) );
$name = apply_filters( 'term_name', $pad . ' ' . $tag->name, $tag );
$qe_data = get_term( $tag->term_id, $taxonomy, OBJECT, 'edit' );
- $edit_link = esc_url( get_edit_term_link( $tag->term_id, $taxonomy, $post_type ) );
+ $edit_link = esc_url( get_edit_term_link( $tag->term_id, $taxonomy, $this->screen->post_type ) );
$out = '' . $name . '
';
@@ -283,13 +282,11 @@ class WP_Terms_List_Table extends WP_List_Table {
}
function column_posts( $tag ) {
- global $taxonomy, $post_type;
-
$count = number_format_i18n( $tag->count );
- $tax = get_taxonomy( $taxonomy );
+ $tax = get_taxonomy( $this->screen->taxonomy );
- $ptype_object = get_post_type_object( $post_type );
+ $ptype_object = get_post_type_object( $this->screen->post_type );
if ( ! $ptype_object->show_ui )
return $count;
@@ -299,8 +296,11 @@ class WP_Terms_List_Table extends WP_List_Table {
$args = array( 'taxonomy' => $tax->name, 'term' => $tag->slug );
}
- if ( 'post' != $post_type )
- $args['post_type'] = $post_type;
+ if ( 'post' != $this->screen->post_type )
+ $args['post_type'] = $this->screen->post_type;
+
+ if ( 'attachment' == $this->screen->post_type )
+ return "$count";
return "$count";
}
@@ -313,9 +313,7 @@ class WP_Terms_List_Table extends WP_List_Table {
}
function column_default( $tag, $column_name ) {
- $screen = get_current_screen();
-
- return apply_filters( "manage_{$screen->taxonomy}_custom_column", '', $column_name, $tag->term_id );
+ return apply_filters( "manage_{$this->screen->taxonomy}_custom_column", '', $column_name, $tag->term_id );
}
/**
@@ -324,7 +322,7 @@ class WP_Terms_List_Table extends WP_List_Table {
* @since 3.1.0
*/
function inline_edit() {
- global $post_type, $tax;
+ $tax = get_taxonomy( $this->screen->taxonomy );
if ( ! current_user_can( $tax->cap->edit_terms ) )
return;
@@ -357,7 +355,7 @@ class WP_Terms_List_Table extends WP_List_Table {
if ( isset( $core_columns[$column_name] ) )
continue;
- do_action( 'quick_edit_custom_box', $column_name, 'edit-tags', $tax->name );
+ do_action( 'quick_edit_custom_box', $column_name, 'edit-tags', $this->screen->taxonomy );
}
?>
@@ -366,11 +364,11 @@ class WP_Terms_List_Table extends WP_List_Table {
labels->update_item; ?>
-
+
-
-
+
+