X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/fef8173b8c3bad08f495551e43cfdeac1cae6021..refs/tags/wordpress-3.4-scripts:/wp-admin/includes/class-wp-terms-list-table.php?ds=sidebyside
diff --git a/wp-admin/includes/class-wp-terms-list-table.php b/wp-admin/includes/class-wp-terms-list-table.php
index ac4d963c..b398a55c 100644
--- a/wp-admin/includes/class-wp-terms-list-table.php
+++ b/wp-admin/includes/class-wp-terms-list-table.php
@@ -11,7 +11,7 @@ class WP_Terms_List_Table extends WP_List_Table {
var $callback_args;
- function WP_Terms_List_Table() {
+ function __construct() {
global $post_type, $taxonomy, $tax;
wp_reset_vars( array( 'action', 'taxonomy', 'post_type' ) );
@@ -24,10 +24,10 @@ class WP_Terms_List_Table extends WP_List_Table {
$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::WP_List_Table( array(
+ parent::__construct( array(
'plural' => 'tags',
'singular' => 'tag',
) );
@@ -42,7 +42,7 @@ class WP_Terms_List_Table extends WP_List_Table {
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 );
@@ -93,11 +93,11 @@ class WP_Terms_List_Table extends WP_List_Table {
}
function get_columns() {
- global $taxonomy, $typenow;
+ global $taxonomy, $post_type;
$columns = array(
'cb' => '',
- 'name' => __( 'Name' ),
+ 'name' => _x( 'Name', 'term name' ),
'description' => __( 'Description' ),
'slug' => __( 'Slug' ),
);
@@ -105,7 +105,6 @@ class WP_Terms_List_Table extends WP_List_Table {
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' );
}
@@ -250,7 +249,7 @@ class WP_Terms_List_Table extends WP_List_Table {
$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 = get_edit_term_link( $tag->term_id, $taxonomy, $post_type );
+ $edit_link = esc_url( get_edit_term_link( $tag->term_id, $taxonomy, $post_type ) );
$out = '' . $name . '
';
@@ -261,6 +260,7 @@ class WP_Terms_List_Table extends WP_List_Table {
}
if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term )
$actions['delete'] = "term_id ) . "'>" . __( 'Delete' ) . "";
+ $actions['view'] = '' . __( 'View' ) . '';
$actions = apply_filters( 'tag_row_actions', $actions, $tag );
$actions = apply_filters( "{$taxonomy}_row_actions", $actions, $tag );
@@ -269,7 +269,7 @@ class WP_Terms_List_Table extends WP_List_Table {
$out .= '