Wordpress 3.5

[autoinstalls/wordpress.git] / 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 ac4d963c5604e24f8753405af9337b783d7ff6e3..85010105cdcc83e256927b7e178997b5d03ced35 100644 (file)
--- 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;
 
 
        var $callback_args;
 

-       function WP_Terms_List_Table() {
-               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 ( empty( $taxonomy ) )
                        $taxonomy = 'post_tag';
 

-               if ( !taxonomy_exists( $taxonomy ) )
+               if ( ! taxonomy_exists( $taxonomy ) )

                        wp_die( __( 'Invalid taxonomy' ) );
 
                $tax = get_taxonomy( $taxonomy );
 
                        wp_die( __( 'Invalid taxonomy' ) );
 
                $tax = get_taxonomy( $taxonomy );
 

-               if ( empty( $post_type ) || !in_array( $post_type, get_post_types( array( 'public' => true ) ) ) )
+               // @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';
 
                        $post_type = 'post';
 

-               parent::WP_List_Table( array(
-                       'plural' => 'tags',
-                       'singular' => 'tag',
-               ) );

        }
 
        function ajax_user_can() {
        }
 
        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() {
        }
 
        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
                        $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
                }
 
                        $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(
                $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,
                ) );
        }
                        'per_page' => $tags_per_page,
                ) );
        }


@@ -93,20 +94,17 @@ class WP_Terms_List_Table extends WP_List_Table {
        }
 
        function get_columns() {
        }
 
        function get_columns() {

-               global $taxonomy, $typenow;
-

                $columns = array(
                        'cb'          => '<input type="checkbox" />',
                $columns = array(
                        'cb'          => '<input type="checkbox" />',

-                       'name'        => __( 'Name' ),
+                       'name'        => _x( 'Name', 'term name' ),

                        'description' => __( 'Description' ),
                        'slug'        => __( 'Slug' ),
                );
 
                        'description' => __( 'Description' ),
                        'slug'        => __( 'Slug' ),
                );
 

-               if ( 'link_category' == $taxonomy ) {
+               if ( 'link_category' == $this->screen->taxonomy ) {

                        $columns['links'] = __( 'Links' );
                } else {
                        $columns['links'] = __( 'Links' );
                } else {

-                       $post_type = empty( $typenow ) ? 'post' : $typenow;
-                       $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' );
                }
 
                        $columns['posts'] = $post_type_object ? $post_type_object->labels->name : __( 'Posts' );
                }
 


@@ -124,7 +122,7 @@ class WP_Terms_List_Table extends WP_List_Table {
        }
 
        function display_rows_or_placeholder() {
        }
 
        function display_rows_or_placeholder() {

-               global $taxonomy;
+               $taxonomy = $this->screen->taxonomy;

 
                $args = wp_parse_args( $this->callback_args, array(
                        'page' => 1,
 
                $args = wp_parse_args( $this->callback_args, array(
                        'page' => 1,


@@ -232,25 +230,25 @@ class WP_Terms_List_Table extends WP_List_Table {
        }
 
        function column_cb( $tag ) {
        }
 
        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 '<label class="screen-reader-text" for="cb-select-' . $tag->term_id . '">' . sprintf( __( 'Select %s' ), $tag->name ) . '</label>'
+                               . '<input type="checkbox" name="delete_tags[]" value="' . $tag->term_id . '" id="cb-select-' . $tag->term_id . '" />';

 
 

-               if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term )
-                       return '<input type="checkbox" name="delete_tags[]" value="' . $tag->term_id . '" />';
-               else
-                       return '&nbsp;';
+               return '&nbsp;';

        }
 
        function column_name( $tag ) {
        }
 
        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( '&#8212; ', max( 0, $this->level ) );
                $name = apply_filters( 'term_name', $pad . ' ' . $tag->name, $tag );
                $qe_data = get_term( $tag->term_id, $taxonomy, OBJECT, 'edit' );
 
                $default_term = get_option( 'default_' . $taxonomy );
 
                $pad = str_repeat( '&#8212; ', 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, $this->screen->post_type ) );

 
                $out = '<strong><a class="row-title" href="' . $edit_link . '" title="' . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $name ) ) . '">' . $name . '</a></strong><br />';
 
 
                $out = '<strong><a class="row-title" href="' . $edit_link . '" title="' . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $name ) ) . '">' . $name . '</a></strong><br />';
 


@@ -261,6 +259,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'] = "<a class='delete-tag' href='" . wp_nonce_url( "edit-tags.php?action=delete&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ) . "'>" . __( 'Delete' ) . "</a>";
                }
                if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term )
                        $actions['delete'] = "<a class='delete-tag' href='" . wp_nonce_url( "edit-tags.php?action=delete&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ) . "'>" . __( 'Delete' ) . "</a>";

+               $actions['view'] = '<a href="' . get_term_link( $tag ) . '">' . __( 'View' ) . '</a>';

 
                $actions = apply_filters( 'tag_row_actions', $actions, $tag );
                $actions = apply_filters( "{$taxonomy}_row_actions", $actions, $tag );
 
                $actions = apply_filters( 'tag_row_actions', $actions, $tag );
                $actions = apply_filters( "{$taxonomy}_row_actions", $actions, $tag );


@@ -269,7 +268,7 @@ class WP_Terms_List_Table extends WP_List_Table {
                $out .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">';
                $out .= '<div class="name">' . $qe_data->name . '</div>';
                $out .= '<div class="slug">' . apply_filters( 'editable_slug', $qe_data->slug ) . '</div>';
                $out .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">';
                $out .= '<div class="name">' . $qe_data->name . '</div>';
                $out .= '<div class="slug">' . apply_filters( 'editable_slug', $qe_data->slug ) . '</div>';

-               $out .= '<div class="parent">' . $qe_data->parent . '</div></div></td>';
+               $out .= '<div class="parent">' . $qe_data->parent . '</div></div>';

 
                return $out;
        }
 
                return $out;
        }


@@ -283,13 +282,12 @@ class WP_Terms_List_Table extends WP_List_Table {
        }
 
        function column_posts( $tag ) {
        }
 
        function column_posts( $tag ) {

-               global $taxonomy, $post_type;
-

                $count = number_format_i18n( $tag->count );
 
                $count = number_format_i18n( $tag->count );
 

-               $tax = get_taxonomy( $taxonomy );
+               $tax = get_taxonomy( $this->screen->taxonomy );

 
 

-               if ( ! $tax->public )
+               $ptype_object = get_post_type_object( $this->screen->post_type );
+               if ( ! $ptype_object->show_ui )

                        return $count;
 
                if ( $tax->query_var ) {
                        return $count;
 
                if ( $tax->query_var ) {


@@ -298,9 +296,13 @@ class WP_Terms_List_Table extends WP_List_Table {
                        $args = array( 'taxonomy' => $tax->name, 'term' => $tag->slug );
                }
 
                        $args = array( 'taxonomy' => $tax->name, 'term' => $tag->slug );
                }
 

-               $args['post_type'] = $post_type;
+               if ( 'post' != $this->screen->post_type )
+                       $args['post_type'] = $this->screen->post_type;

 
 

-               return "<a href='" . add_query_arg( $args, 'edit.php' ) . "'>$count</a>";
+               if ( 'attachment' == $this->screen->post_type )
+                       return "<a href='" . esc_url ( add_query_arg( $args, 'upload.php' ) ) . "'>$count</a>";
+
+               return "<a href='" . esc_url ( add_query_arg( $args, 'edit.php' ) ) . "'>$count</a>";

        }
 
        function column_links( $tag ) {
        }
 
        function column_links( $tag ) {


@@ -311,9 +313,7 @@ class WP_Terms_List_Table extends WP_List_Table {
        }
 
        function column_default( $tag, $column_name ) {
        }
 
        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 );

        }
 
        /**
        }
 
        /**


@@ -322,7 +322,7 @@ class WP_Terms_List_Table extends WP_List_Table {
         * @since 3.1.0
         */
        function inline_edit() {
         * @since 3.1.0
         */
        function inline_edit() {

-               global $tax;
+               $tax = get_taxonomy( $this->screen->taxonomy );

 
                if ( ! current_user_can( $tax->cap->edit_terms ) )
                        return;
 
                if ( ! current_user_can( $tax->cap->edit_terms ) )
                        return;


@@ -335,7 +335,7 @@ class WP_Terms_List_Table extends WP_List_Table {
                                <h4><?php _e( 'Quick Edit' ); ?></h4>
 
                                <label>
                                <h4><?php _e( 'Quick Edit' ); ?></h4>
 
                                <label>

-                                       <span class="title"><?php _e( 'Name' ); ?></span>
+                                       <span class="title"><?php _ex( 'Name', 'term name' ); ?></span>

                                        <span class="input-text-wrap"><input type="text" name="name" class="ptitle" value="" /></span>
                                </label>
        <?php if ( !global_terms_enabled() ) { ?>
                                        <span class="input-text-wrap"><input type="text" name="name" class="ptitle" value="" /></span>
                                </label>
        <?php if ( !global_terms_enabled() ) { ?>


@@ -355,19 +355,20 @@ class WP_Terms_List_Table extends WP_List_Table {
                        if ( isset( $core_columns[$column_name] ) )
                                continue;
 
                        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 );

                }
 
        ?>
 
                <p class="inline-edit-save submit">
                }
 
        ?>
 
                <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>
                        <?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="spinner"></span>

                        <span class="error" style="display:none;"></span>
                        <?php wp_nonce_field( 'taxinlineeditnonce', '_inline_edit', false ); ?>
                        <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="taxonomy" value="<?php echo esc_attr( $this->screen->taxonomy ); ?>" />
+                       <input type="hidden" name="post_type" value="<?php echo esc_attr( $this->screen->post_type ); ?>" />

                        <br class="clear" />
                </p>
                </td></tr>
                        <br class="clear" />
                </p>
                </td></tr>


@@ -375,5 +376,3 @@ class WP_Terms_List_Table extends WP_List_Table {
        <?php
        }
 }
        <?php
        }
 }

-
-?>