--- a/wp/wp-admin/includes/class-wp-terms-list-table.php Tue Jun 09 11:14:17 2015 +0000
+++ b/wp/wp-admin/includes/class-wp-terms-list-table.php Mon Oct 14 17:39:30 2019 +0200
@@ -1,11 +1,19 @@
<?php
/**
- * Terms List Table class.
+ * List Table API: WP_Terms_List_Table class
*
* @package WordPress
- * @subpackage List_Table
+ * @subpackage Administration
+ * @since 3.1.0
+ */
+
+/**
+ * Core class used to implement displaying terms in a list table.
+ *
* @since 3.1.0
* @access private
+ *
+ * @see WP_List_Table
*/
class WP_Terms_List_Table extends WP_List_Table {
@@ -17,10 +25,14 @@
* Constructor.
*
* @since 3.1.0
- * @access public
*
* @see WP_List_Table::__construct() for more information on default arguments.
*
+ * @global string $post_type
+ * @global string $taxonomy
+ * @global string $action
+ * @global object $tax
+ *
* @param array $args An associative array of arguments.
*/
public function __construct( $args = array() ) {
@@ -40,7 +52,7 @@
$taxonomy = 'post_tag';
if ( ! taxonomy_exists( $taxonomy ) )
- wp_die( __( 'Invalid taxonomy' ) );
+ wp_die( __( 'Invalid taxonomy.' ) );
$tax = get_taxonomy( $taxonomy );
@@ -50,16 +62,22 @@
}
+ /**
+ *
+ * @return bool
+ */
public function ajax_user_can() {
return current_user_can( get_taxonomy( $this->screen->taxonomy )->cap->manage_terms );
}
+ /**
+ */
public function prepare_items() {
$tags_per_page = $this->get_items_per_page( 'edit_' . $this->screen->taxonomy . '_per_page' );
- if ( 'post_tag' == $this->screen->taxonomy ) {
+ if ( 'post_tag' === $this->screen->taxonomy ) {
/**
- * Filter the number of terms displayed per page for the Tags list table.
+ * Filters the number of terms displayed per page for the Tags list table.
*
* @since 2.8.0
*
@@ -68,7 +86,7 @@
$tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page );
/**
- * Filter the number of terms displayed per page for the Tags list table.
+ * Filters the number of terms displayed per page for the Tags list table.
*
* @since 2.7.0
* @deprecated 2.8.0 Use edit_tags_per_page instead.
@@ -76,9 +94,9 @@
* @param int $tags_per_page Number of tags to be displayed. Default 20.
*/
$tags_per_page = apply_filters( 'tagsperpage', $tags_per_page );
- } elseif ( 'category' == $this->screen->taxonomy ) {
+ } elseif ( 'category' === $this->screen->taxonomy ) {
/**
- * Filter the number of terms displayed per page for the Categories list table.
+ * Filters the number of terms displayed per page for the Categories list table.
*
* @since 2.8.0
*
@@ -109,29 +127,50 @@
) );
}
+ /**
+ *
+ * @return bool
+ */
public function has_items() {
// todo: populate $this->items in prepare_items()
return true;
}
+ /**
+ */
public function no_items() {
echo get_taxonomy( $this->screen->taxonomy )->labels->not_found;
}
+ /**
+ *
+ * @return array
+ */
protected function get_bulk_actions() {
$actions = array();
- $actions['delete'] = __( 'Delete' );
+
+ if ( current_user_can( get_taxonomy( $this->screen->taxonomy )->cap->delete_terms ) ) {
+ $actions['delete'] = __( 'Delete' );
+ }
return $actions;
}
+ /**
+ *
+ * @return string
+ */
public function current_action() {
- if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && ( 'delete' == $_REQUEST['action'] || 'delete' == $_REQUEST['action2'] ) )
+ if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && ( 'delete' === $_REQUEST['action'] || 'delete' === $_REQUEST['action2'] ) )
return 'bulk-delete';
return parent::current_action();
}
+ /**
+ *
+ * @return array
+ */
public function get_columns() {
$columns = array(
'cb' => '<input type="checkbox" />',
@@ -140,7 +179,7 @@
'slug' => __( 'Slug' ),
);
- if ( 'link_category' == $this->screen->taxonomy ) {
+ if ( 'link_category' === $this->screen->taxonomy ) {
$columns['links'] = __( 'Links' );
} else {
$columns['posts'] = _x( 'Count', 'Number/count of items' );
@@ -149,6 +188,10 @@
return $columns;
}
+ /**
+ *
+ * @return array
+ */
protected function get_sortable_columns() {
return array(
'name' => 'name',
@@ -159,6 +202,8 @@
);
}
+ /**
+ */
public function display_rows_or_placeholder() {
$taxonomy = $this->screen->taxonomy;
@@ -185,7 +230,7 @@
}
$terms = get_terms( $taxonomy, $args );
- if ( empty( $terms ) ) {
+ if ( empty( $terms ) || ! is_array( $terms ) ) {
echo '<tr class="no-items"><td class="colspanchange" colspan="' . $this->get_column_count() . '">';
$this->no_items();
echo '</td></tr>';
@@ -201,7 +246,6 @@
// Some funky recursion to get the job done( Paging & parents mainly ) is contained within, Skip it for non-hierarchical taxonomies for performance sake
$this->_rows( $taxonomy, $terms, $children, $offset, $number, $count );
} else {
- $terms = get_terms( $taxonomy, $args );
foreach ( $terms as $term ) {
$this->single_row( $term );
}
@@ -212,11 +256,11 @@
* @param string $taxonomy
* @param array $terms
* @param array $children
- * @param int $start
- * @param int $per_page
- * @param int $count
- * @param int $parent
- * @param int $level
+ * @param int $start
+ * @param int $per_page
+ * @param int $count
+ * @param int $parent
+ * @param int $level
*/
private function _rows( $taxonomy, $terms, &$children, $start, $per_page, &$count, $parent = 0, $level = 0 ) {
@@ -268,7 +312,7 @@
/**
* @global string $taxonomy
- * @param object $tag
+ * @param WP_Term $tag Term object.
* @param int $level
*/
public function single_row( $tag, $level = 0 ) {
@@ -283,33 +327,29 @@
}
/**
- * @param object $tag
+ * @param WP_Term $tag Term object.
* @return string
*/
public function column_cb( $tag ) {
- $default_term = get_option( 'default_' . $this->screen->taxonomy );
-
- if ( current_user_can( get_taxonomy( $this->screen->taxonomy )->cap->delete_terms ) && $tag->term_id != $default_term )
+ if ( current_user_can( 'delete_term', $tag->term_id ) ) {
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 . '" />';
+ }
return ' ';
}
/**
- * @param object $tag
+ * @param WP_Term $tag Term object.
* @return string
*/
public function column_name( $tag ) {
$taxonomy = $this->screen->taxonomy;
- $tax = get_taxonomy( $taxonomy );
-
- $default_term = get_option( 'default_' . $taxonomy );
$pad = str_repeat( '— ', max( 0, $this->level ) );
/**
- * Filter display of the term name in the terms list table.
+ * Filters display of the term name in the terms list table.
*
* The default output may include padding due to the term's
* current level in the term hierarchy.
@@ -319,39 +359,123 @@
* @see WP_Terms_List_Table::column_name()
*
* @param string $pad_tag_name The term name, padded if not top-level.
- * @param object $tag Term object.
+ * @param WP_Term $tag Term object.
*/
$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, $this->screen->post_type ) );
+
+ $uri = wp_doing_ajax() ? wp_get_referer() : $_SERVER['REQUEST_URI'];
+
+ $edit_link = add_query_arg(
+ 'wp_http_referer',
+ urlencode( wp_unslash( $uri ) ),
+ get_edit_term_link( $tag->term_id, $taxonomy, $this->screen->post_type )
+ );
+
+ $out = sprintf(
+ '<strong><a class="row-title" href="%s" aria-label="%s">%s</a></strong><br />',
+ esc_url( $edit_link ),
+ /* translators: %s: taxonomy term name */
+ esc_attr( sprintf( __( '“%s” (Edit)' ), $tag->name ) ),
+ $name
+ );
+
+ $out .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">';
+ $out .= '<div class="name">' . $qe_data->name . '</div>';
+
+ /** This filter is documented in wp-admin/edit-tag-form.php */
+ $out .= '<div class="slug">' . apply_filters( 'editable_slug', $qe_data->slug, $qe_data ) . '</div>';
+ $out .= '<div class="parent">' . $qe_data->parent . '</div></div>';
+
+ return $out;
+ }
- $out = '<strong><a class="row-title" href="' . $edit_link . '" title="' . esc_attr( sprintf( __( 'Edit “%s”' ), $name ) ) . '">' . $name . '</a></strong><br />';
+ /**
+ * Gets the name of the default primary column.
+ *
+ * @since 4.3.0
+ *
+ * @return string Name of the default primary column, in this case, 'name'.
+ */
+ protected function get_default_primary_column_name() {
+ return 'name';
+ }
+
+ /**
+ * Generates and displays row action links.
+ *
+ * @since 4.3.0
+ *
+ * @param WP_Term $tag Tag being acted upon.
+ * @param string $column_name Current column name.
+ * @param string $primary Primary column name.
+ * @return string Row actions output for terms.
+ */
+ protected function handle_row_actions( $tag, $column_name, $primary ) {
+ if ( $primary !== $column_name ) {
+ return '';
+ }
+
+ $taxonomy = $this->screen->taxonomy;
+ $tax = get_taxonomy( $taxonomy );
+ $uri = wp_doing_ajax() ? wp_get_referer() : $_SERVER['REQUEST_URI'];
+
+ $edit_link = add_query_arg(
+ 'wp_http_referer',
+ urlencode( wp_unslash( $uri ) ),
+ get_edit_term_link( $tag->term_id, $taxonomy, $this->screen->post_type )
+ );
$actions = array();
- if ( current_user_can( $tax->cap->edit_terms ) ) {
- $actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
- $actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __( 'Quick Edit' ) . '</a>';
+ if ( current_user_can( 'edit_term', $tag->term_id ) ) {
+ $actions['edit'] = sprintf(
+ '<a href="%s" aria-label="%s">%s</a>',
+ esc_url( $edit_link ),
+ /* translators: %s: taxonomy term name */
+ esc_attr( sprintf( __( 'Edit “%s”' ), $tag->name ) ),
+ __( 'Edit' )
+ );
+ $actions['inline hide-if-no-js'] = sprintf(
+ '<a href="#" class="editinline aria-button-if-js" aria-label="%s">%s</a>',
+ /* translators: %s: taxonomy term name */
+ esc_attr( sprintf( __( 'Quick edit “%s” inline' ), $tag->name ) ),
+ __( 'Quick Edit' )
+ );
}
- 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&taxonomy=$taxonomy&tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ) . "'>" . __( 'Delete' ) . "</a>";
- if ( $tax->public )
- $actions['view'] = '<a href="' . get_term_link( $tag ) . '">' . __( 'View' ) . '</a>';
+ if ( current_user_can( 'delete_term', $tag->term_id ) ) {
+ $actions['delete'] = sprintf(
+ '<a href="%s" class="delete-tag aria-button-if-js" aria-label="%s">%s</a>',
+ wp_nonce_url( "edit-tags.php?action=delete&taxonomy=$taxonomy&tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ),
+ /* translators: %s: taxonomy term name */
+ esc_attr( sprintf( __( 'Delete “%s”' ), $tag->name ) ),
+ __( 'Delete' )
+ );
+ }
+ if ( $tax->public ) {
+ $actions['view'] = sprintf(
+ '<a href="%s" aria-label="%s">%s</a>',
+ get_term_link( $tag ),
+ /* translators: %s: taxonomy term name */
+ esc_attr( sprintf( __( 'View “%s” archive' ), $tag->name ) ),
+ __( 'View' )
+ );
+ }
/**
- * Filter the action links displayed for each term in the Tags list table.
+ * Filters the action links displayed for each term in the Tags list table.
*
* @since 2.8.0
* @deprecated 3.0.0 Use {$taxonomy}_row_actions instead.
*
* @param array $actions An array of action links to be displayed. Default
* 'Edit', 'Quick Edit', 'Delete', and 'View'.
- * @param object $tag Term object.
+ * @param WP_Term $tag Term object.
*/
$actions = apply_filters( 'tag_row_actions', $actions, $tag );
/**
- * Filter the action links displayed for each term in the terms list table.
+ * Filters the action links displayed for each term in the terms list table.
*
* The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.
*
@@ -359,40 +483,36 @@
*
* @param array $actions An array of action links to be displayed. Default
* 'Edit', 'Quick Edit', 'Delete', and 'View'.
- * @param object $tag Term object.
+ * @param WP_Term $tag Term object.
*/
$actions = apply_filters( "{$taxonomy}_row_actions", $actions, $tag );
- $out .= $this->row_actions( $actions );
- $out .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">';
- $out .= '<div class="name">' . $qe_data->name . '</div>';
-
- /** This filter is documented in wp-admin/edit-tag-form.php */
- $out .= '<div class="slug">' . apply_filters( 'editable_slug', $qe_data->slug ) . '</div>';
- $out .= '<div class="parent">' . $qe_data->parent . '</div></div>';
-
- return $out;
+ return $this->row_actions( $actions );
}
/**
- * @param object $tag
+ * @param WP_Term $tag Term object.
* @return string
*/
public function column_description( $tag ) {
- return $tag->description;
+ if ( $tag->description ) {
+ return $tag->description;
+ } else {
+ return '<span aria-hidden="true">—</span><span class="screen-reader-text">' . __( 'No description' ) . '</span>';
+ }
}
/**
- * @param object $tag
+ * @param WP_Term $tag Term object.
* @return string
*/
public function column_slug( $tag ) {
/** This filter is documented in wp-admin/edit-tag-form.php */
- return apply_filters( 'editable_slug', $tag->slug );
+ return apply_filters( 'editable_slug', $tag->slug, $tag );
}
/**
- * @param object $tag
+ * @param WP_Term $tag Term object.
* @return string
*/
public function column_posts( $tag ) {
@@ -413,14 +533,14 @@
if ( 'post' != $this->screen->post_type )
$args['post_type'] = $this->screen->post_type;
- if ( 'attachment' == $this->screen->post_type )
+ 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>";
}
/**
- * @param object $tag
+ * @param WP_Term $tag Term object.
* @return string
*/
public function column_links( $tag ) {
@@ -431,13 +551,13 @@
}
/**
- * @param object $tag
+ * @param WP_Term $tag Term object.
* @param string $column_name
* @return string
*/
public function column_default( $tag, $column_name ) {
/**
- * Filter the displayed columns in the terms list table.
+ * Filters the displayed columns in the terms list table.
*
* The dynamic portion of the hook name, `$this->screen->taxonomy`,
* refers to the slug of the current taxonomy.
@@ -466,9 +586,9 @@
<form method="get"><table style="display: none"><tbody id="inlineedit">
<tr id="inline-edit" class="inline-edit-row" style="display: none"><td colspan="<?php echo $this->get_column_count(); ?>" class="colspanchange">
- <fieldset><div class="inline-edit-col">
- <h4><?php _e( 'Quick Edit' ); ?></h4>
-
+ <fieldset>
+ <legend class="inline-edit-legend"><?php _e( 'Quick Edit' ); ?></legend>
+ <div class="inline-edit-col">
<label>
<span class="title"><?php _ex( 'Name', 'term name' ); ?></span>
<span class="input-text-wrap"><input type="text" name="name" class="ptitle" value="" /></span>
@@ -496,16 +616,18 @@
?>
- <p class="inline-edit-save submit">
- <a href="#inline-edit" class="cancel button-secondary alignleft"><?php _e( 'Cancel' ); ?></a>
- <a href="#inline-edit" class="save button-primary alignright"><?php echo $tax->labels->update_item; ?></a>
+ <div class="inline-edit-save submit">
+ <button type="button" class="cancel button alignleft"><?php _e( 'Cancel' ); ?></button>
+ <button type="button" class="save button button-primary alignright"><?php echo $tax->labels->update_item; ?></button>
<span class="spinner"></span>
- <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( $this->screen->taxonomy ); ?>" />
<input type="hidden" name="post_type" value="<?php echo esc_attr( $this->screen->post_type ); ?>" />
<br class="clear" />
- </p>
+ <div class="notice notice-error notice-alt inline hidden">
+ <p class="error"></p>
+ </div>
+ </div>
</td></tr>
</tbody></table></form>
<?php