Changeset 24127

Timestamp:

04/29/2013 01:39:28 PM (13 years ago)

Author:

nacin

Message:

Terms list table:

• Don't call single_row() with an undeclared and unused $taxonomy argument.
• Don't define optional parameters before required parameters in the _rows() method. Make them required.
• Move empty( $terms ) check above other operations. This function was improperly returning an else case until [24123].

props rlerdorf.
see #24210.

File:

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

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

@@ -144 +144 @@
                         // We'll need the full set of terms then.
                         $args['number'] = $args['offset'] = 0;
-
-                        $terms = get_terms( $taxonomy, $args );
+                }
+                $terms = get_terms( $taxonomy, $args );
+
+                if ( empty( $terms ) ) {
+                        list( $columns, $hidden ) = $this->get_column_info();
+                        echo '<tr class="no-items"><td class="colspanchange" colspan="' . $this->get_column_count() . '">';
+                        $this->no_items();
+                        echo '</td></tr>';
+                        return;
+                }
+
+                if ( is_taxonomy_hierarchical( $taxonomy ) && !isset( $orderby ) ) {
                         if ( !empty( $search ) ) // Ignore children on searches.
                                 $children = array();
@@ -156 +166 @@
                         $terms = get_terms( $taxonomy, $args );
                         foreach ( $terms as $term )
-                                $this->single_row( $term, 0, $taxonomy );
+                                $this->single_row( $term );
                         $count = $number; // Only displaying a single page.
                 }
-
-                if ( empty( $terms ) ) {
-                        list( $columns, $hidden ) = $this->get_column_info();
-                        echo '<tr class="no-items"><td class="colspanchange" colspan="' . $this->get_column_count() . '">';
-                        $this->no_items();
-                        echo '</td></tr>';
-                }
-        }
-
-        function _rows( $taxonomy, $terms, &$children, $start = 0, $per_page = 20, &$count, $parent = 0, $level = 0 ) {
+        }
+
+        function _rows( $taxonomy, $terms, &$children, $start, $per_page, &$count, $parent = 0, $level = 0 ) {
 
                 $end = $start + $per_page;
@@ -197 +200 @@
                                 while ( $my_parent = array_pop( $my_parents ) ) {
                                         echo "\t";
-                                        $this->single_row( $my_parent, $level - $num_parents, $taxonomy );
+                                        $this->single_row( $my_parent, $level - $num_parents );
                                         $num_parents--;
                                 }
@@ -204 +207 @@
                         if ( $count >= $start ) {
                                 echo "\t";
-                                $this->single_row( $term, $level, $taxonomy );
+                                $this->single_row( $term, $level );
                         }