Changeset 6087

Timestamp:

09/12/2007 12:49:16 AM (19 years ago)

Author:

ryan

Message:

Resurrect count padding.

File:

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

trunk/wp-includes/taxonomy.php

@@ -387 +387 @@
                 'hide_empty' => true, 'exclude' => '', 'include' => '',
                 'number' => '', 'fields' => 'all', 'slug' => '', 'parent' => '',
-                'hierarchical' => true, 'child_of' => 0, 'get' => '', 'name__like' => '');
+                'hierarchical' => true, 'child_of' => 0, 'get' => '', 'name__like' => '',
+                'pad_counts' => false);
         $args = wp_parse_args( $args, $defaults );
         $args['number'] = (int) $args['number'];
@@ -394 +395 @@
                 $args['child_of'] = 0;
                 $args['hierarchical'] = false;
+                $args['pad_counts'] = false;
         }
 
@@ -400 +402 @@
                 $args['hide_empty'] = 0;
                 $args['hierarchical'] = false;
+                $args['pad_counts'] = false;
         }
         extract($args, EXTR_SKIP);
@@ -511 +514 @@
         }
 
-        /*
-        // Update category counts to include children.
+        // Update term counts to include children.
         if ( $pad_counts )
-                _pad_category_counts($type, $categories);
-        */
+                _pad_term_counts($terms, $taxonomies[0]);
 
         // Make sure we show empty categories that have children.
@@ -1130 +1131 @@
 }
 
+// Recalculates term counts by including items from child terms
+// Assumes all relevant children are already in the $terms argument
+function _pad_term_counts(&$terms, $taxonomy) {
+        $term_hier = _get_term_hierarchy($taxonomy);
+
+        if ( empty($term_hier) )
+                return;
+
+        foreach ( $terms as $key => $term ) {
+                if ( $children = _get_term_children($term->term_id, $terms, $taxonomy) ) {
+                        foreach ( $children as $child ) {
+                                $child = get_term($child, $taxonomy);
+                                $terms[$key]->count += $child->count;
+                        }
+                }
+        }
+}
+
 //
 // Default callbacks