X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/8ab4a4532479e8db471032b51042ec8c4716d091..3194d1bb103c2d8db4f44feeced5e58ee2756658:/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 5eda1869..765b1a36 100644
--- a/wp-admin/includes/class-wp-terms-list-table.php
+++ b/wp-admin/includes/class-wp-terms-list-table.php
@@ -1,11 +1,19 @@
screen->taxonomy )->cap->manage_terms );
}
+ /**
+ * @access public
+ */
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.
*
@@ -76,7 +96,7 @@ class WP_Terms_List_Table extends WP_List_Table {
* @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.
*
@@ -109,15 +129,26 @@ class WP_Terms_List_Table extends WP_List_Table {
) );
}
+ /**
+ *
+ * @return bool
+ */
public function has_items() {
// todo: populate $this->items in prepare_items()
return true;
}
+ /**
+ * @access public
+ */
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' );
@@ -125,13 +156,21 @@ class WP_Terms_List_Table extends WP_List_Table {
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' => '',
@@ -140,7 +179,7 @@ class WP_Terms_List_Table extends WP_List_Table {
'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 @@ class WP_Terms_List_Table extends WP_List_Table {
return $columns;
}
+ /**
+ *
+ * @return array
+ */
protected function get_sortable_columns() {
return array(
'name' => 'name',
@@ -159,6 +202,9 @@ class WP_Terms_List_Table extends WP_List_Table {
);
}
+ /**
+ * @access public
+ */
public function display_rows_or_placeholder() {
$taxonomy = $this->screen->taxonomy;
@@ -185,7 +231,7 @@ class WP_Terms_List_Table extends WP_List_Table {
}
$terms = get_terms( $taxonomy, $args );
- if ( empty( $terms ) ) {
+ if ( empty( $terms ) || ! is_array( $terms ) ) {
echo '
';
$this->no_items();
echo ' |
';
@@ -201,7 +247,6 @@ class WP_Terms_List_Table extends WP_List_Table {
// 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 +257,11 @@ class WP_Terms_List_Table extends WP_List_Table {
* @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 ) {
@@ -302,9 +347,6 @@ class WP_Terms_List_Table extends WP_List_Table {
*/
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 ) );
@@ -324,13 +366,70 @@ class WP_Terms_List_Table extends WP_List_Table {
$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 ) );
- $out = '' . $name . '
';
+ $uri = ( defined( 'DOING_AJAX' ) && 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 = '' . $name . '
';
+
+ $out .= '';
+ $out .= '
' . $qe_data->name . '
';
+
+ /** This filter is documented in wp-admin/edit-tag-form.php */
+ $out .= '
' . apply_filters( 'editable_slug', $qe_data->slug, $qe_data ) . '
';
+ $out .= '
' . $qe_data->parent . '
';
+
+ return $out;
+ }
+
+ /**
+ * Gets the name of the default primary column.
+ *
+ * @since 4.3.0
+ * @access protected
+ *
+ * @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
+ * @access protected
+ *
+ * @param object $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 );
+ $default_term = get_option( 'default_' . $taxonomy );
+
+ $uri = ( defined( 'DOING_AJAX' ) && 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'] = '' . __( 'Edit' ) . '';
+ $actions['edit'] = '' . __( 'Edit' ) . '';
$actions['inline hide-if-no-js'] = '' . __( 'Quick Edit' ) . '';
}
if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term )
@@ -363,15 +462,7 @@ class WP_Terms_List_Table extends WP_List_Table {
*/
$actions = apply_filters( "{$taxonomy}_row_actions", $actions, $tag );
- $out .= $this->row_actions( $actions );
- $out .= '';
- $out .= '
' . $qe_data->name . '
';
-
- /** This filter is documented in wp-admin/edit-tag-form.php */
- $out .= '
' . apply_filters( 'editable_slug', $qe_data->slug ) . '
';
- $out .= '
' . $qe_data->parent . '
';
-
- return $out;
+ return $this->row_actions( $actions );
}
/**
@@ -388,7 +479,7 @@ class WP_Terms_List_Table extends WP_List_Table {
*/
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 );
}
/**
@@ -413,7 +504,7 @@ class WP_Terms_List_Table extends WP_List_Table {
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 "$count";
return "$count";
@@ -466,9 +557,9 @@ class WP_Terms_List_Table extends WP_List_Table {