Changeset 13086 for trunk/wp-admin/includes/template.php

Timestamp:

02/13/2010 05:40:47 AM (10 years ago)

Author:

dd32

Message:

Convert Terms page to use WP_Ajax_Response(), hierarchical terms will now appear under their parent OR have the parents prefixed, Terms will be removed from tag cloud/parent list upon deletion, Terms will be added to Parent list in correct order upon ajax creation, Errors on term creation flow back to UI, clean up _tag_row() alternate class handling, Show None text in Category dropdown if empty and show_if_empty = true. See #11838

File:

• trunk/wp-admin/includes/template.php (modified) (5 diffs)

trunk/wp-admin/includes/template.php

@@ -483 +483 @@
  * @return unknown
  */
-function _tag_row( $tag, $level, $class = '', $taxonomy = 'post_tag' ) {
+function _tag_row( $tag, $level, $taxonomy = 'post_tag' ) {
+        static $row_class = '';
+        $row_class = ($row_class == '' ? ' class="alternate"' : '');
+
         $count = number_format_i18n( $tag->count );
         if ( 'post_tag' == $taxonomy )
@@ -497 +500 @@
 
         $pad = str_repeat( '— ', max(0, $level) );
-        $name = apply_filters( 'term_name', $pad . ' ' . $tag->name );
+        $name = apply_filters( 'term_name', $pad . ' ' . $tag->name, $tag );
         $qe_data = get_term($tag->term_id, $taxonomy, object, 'edit');
         $edit_link = "edit-tags.php?action=edit&taxonomy=$taxonomy&tag_ID=$tag->term_id";
 
         $out = '';
-        $out .= '<tr id="tag-' . $tag->term_id . '"' . $class . '>';
+        $out .= '<tr id="tag-' . $tag->term_id . '"' . $row_class . '>';
+
 
         $columns = get_column_headers('edit-tags');
@@ -608 +612 @@
             $children = _get_term_hierarchy($taxonomy);
 
-        // Some funky recursion to get the job done is contained within, Skip it for non-hierarchical taxonomies for performance sake
+        // Some funky recursion to get the job done(Paging & parents mainly) is contained within, Skip it for non-hierarchical taxonomies for performance sake
         $out .= _term_rows($taxonomy, $terms, $children, $page, $pagesize, $count);
     } else {
         $terms = get_terms( $taxonomy, $args );
         foreach( $terms as $term )
-            $out .= _tag_row( $term, 0, ++$count % 2 ? ' class="alternate"' : '', $taxonomy );
+            $out .= _tag_row( $term, 0, $taxonomy );
     }
 
@@ -649 +653 @@
 
             $num_parents = count($my_parents);
-            $count -= $num_parents; // Do not include parents in the per-page count, This is due to paging issues with unknown numbers of rows.
             while ( $my_parent = array_pop($my_parents) ) {
-                $output .=  "\t" . _tag_row( $my_parent, $level - $num_parents, ++$count % 2 ? ' class="alternate"' : '', $taxonomy );
+                $output .=  "\t" . _tag_row( $my_parent, $level - $num_parents, $taxonomy );
                 $num_parents--;
             }
@@ -657 +660 @@
 
         if ( $count >= $start )
-            $output .= "\t" . _tag_row( $term, $level, ++$count % 2 ? ' class="alternate"' : '', $taxonomy );
-        else
-            ++$count;
+            $output .= "\t" . _tag_row( $term, $level, $taxonomy );
+
+        ++$count;
 
         unset($terms[$key]);
 
-        if ( isset($children[$term->term_id]) )
+        if ( isset($children[$term->term_id]) && empty($_GET['s']) )
             $output .= _term_rows( $taxonomy, $terms, $children, $page, $per_page, $count, $term->term_id, $level + 1 );
     }