Changeset 32739

Timestamp:

06/12/2015 06:54:56 PM (11 years ago)

Author:

wonderboymusic

Message:

In WP_Terms_List_Table::display_rows_or_placeholder():

• get_terms() can return WP_Error, so its return value should be checked before traversing.
• The 2nd call to get_terms() can be removed, it is redundant #OPTIMIZATION

See #32444.

File:

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

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

@@ -224 +224 @@
                 $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();
@@ -240 +240 @@
                         $this->_rows( $taxonomy, $terms, $children, $offset, $number, $count );
                 } else {
-                        $terms = get_terms( $taxonomy, $args );
                         foreach ( $terms as $term ) {
                                 $this->single_row( $term );