Changeset 51896

Timestamp:

10/08/2021 12:36:18 AM (7 weeks ago)

Author:

SergeyBiryukov

Message:

Taxonomy: Populate the WP_Terms_List_Table::$items property in ::prepare_items().

This allows the parent WP_List_Table::has_items() method to work as expected, and the override in the child class can now be removed. It also makes the class more consistent with other list table classes.

As a result of this change, the "Bulk actions" dropdown is no longer unnecessarily displayed if there are no terms.

Follow-up to [15491], [17025], [17026].

Props mattoakley, swissspidy, audrasjb, SergeyBiryukov.
Fixes #54181.

File:

• trunk/src/wp-admin/includes/class-wp-terms-list-table.php (modified) (9 diffs)

trunk/src/wp-admin/includes/class-wp-terms-list-table.php

@@ -78 +78 @@
      */
     public function prepare_items() {
-        $tags_per_page = $this->get_items_per_page( 'edit_' . $this->screen->taxonomy . '_per_page' );
-
-        if ( 'post_tag' === $this->screen->taxonomy ) {
+        $taxonomy = $this->screen->taxonomy;
+
+        $tags_per_page = $this->get_items_per_page( "edit_{$taxonomy}_per_page" );
+
+        if ( 'post_tag' === $taxonomy ) {
             /**
              * Filters the number of terms displayed per page for the Tags list table.
@@ -99 +101 @@
              */
             $tags_per_page = apply_filters_deprecated( 'tagsperpage', array( $tags_per_page ), '2.8.0', 'edit_tags_per_page' );
-        } elseif ( 'category' === $this->screen->taxonomy ) {
+        } elseif ( 'category' === $taxonomy ) {
             /**
              * Filters the number of terms displayed per page for the Categories list table.
@@ -113 +115 @@
 
         $args = array(
-            'search' => $search,
-            'page'   => $this->get_pagenum(),
-            'number' => $tags_per_page,
+            'taxonomy'   => $taxonomy,
+            'search'     => $search,
+            'page'       => $this->get_pagenum(),
+            'number'     => $tags_per_page,
+            'hide_empty' => 0,
         );
 
@@ -126 +130 @@
         }
 
+        $args['offset'] = ( $args['page'] - 1 ) * $args['number'];
+
+        // Save the values because 'number' and 'offset' can be subsequently overridden.
         $this->callback_args = $args;
+
+        if ( is_taxonomy_hierarchical( $taxonomy ) && ! isset( $args['orderby'] ) ) {
+            // We'll need the full set of terms then.
+            $args['number'] = 0;
+            $args['offset'] = $args['number'];
+        }
+
+        $this->items = get_terms( $args );
 
         $this->set_pagination_args(
@@ -132 +147 @@
                 'total_items' => wp_count_terms(
                     array(
-                        'taxonomy' => $this->screen->taxonomy,
+                        'taxonomy' => $taxonomy,
                         'search'   => $search,
                     )
@@ -139 +154 @@
             )
         );
-    }
-
-    /**
-     * @return bool
-     */
-    public function has_items() {
-        // @todo Populate $this->items in prepare_items().
-        return true;
     }
 
@@ -217 +224 @@
         $taxonomy = $this->screen->taxonomy;
 
-        $args = wp_parse_args(
-            $this->callback_args,
-            array(
-                'taxonomy'   => $taxonomy,
-                'page'       => 1,
-                'number'     => 20,
-                'search'     => '',
-                'hide_empty' => 0,
-            )
-        );
-
-        $page = $args['page'];
-
-        // Set variable because $args['number'] can be subsequently overridden.
-        $number = $args['number'];
-
-        $offset         = ( $page - 1 ) * $number;
-        $args['offset'] = $offset;
+        $number = $this->callback_args['number'];
+        $offset = $this->callback_args['offset'];
 
         // Convert it to table rows.
         $count = 0;
 
-        if ( is_taxonomy_hierarchical( $taxonomy ) && ! isset( $args['orderby'] ) ) {
-            // We'll need the full set of terms then.
-            $args['number'] = 0;
-            $args['offset'] = $args['number'];
-        }
-
-        $terms = get_terms( $args );
-
-        if ( empty( $terms ) || ! is_array( $terms ) ) {
+        if ( empty( $this->items ) || ! is_array( $this->items ) ) {
             echo '<tr class="no-items"><td class="colspanchange" colspan="' . $this->get_column_count() . '">';
             $this->no_items();
@@ -254 +237 @@
         }
 
-        if ( is_taxonomy_hierarchical( $taxonomy ) && ! isset( $args['orderby'] ) ) {
-            if ( ! empty( $args['search'] ) ) {// Ignore children on searches.
+        if ( is_taxonomy_hierarchical( $taxonomy ) && ! isset( $this->callback_args['orderby'] ) ) {
+            if ( ! empty( $this->callback_args['search'] ) ) {// Ignore children on searches.
                 $children = array();
             } else {
@@ -265 +248 @@
              * Skip it for non-hierarchical taxonomies for performance sake.
              */
-            $this->_rows( $taxonomy, $terms, $children, $offset, $number, $count );
+            $this->_rows( $taxonomy, $this->items, $children, $offset, $number, $count );
         } else {
-            foreach ( $terms as $term ) {
+            foreach ( $this->items as $term ) {
                 $this->single_row( $term );
             }