Changeset 4104

Timestamp:

08/17/2006 04:46:16 AM (20 years ago)

Author:

ryan

Message:

Update category counts to include children. Don't hide empty parent cats that have non-empty children. Props skeltoac.

File:

• trunk/wp-includes/category.php (modified) (2 diffs)

trunk/wp-includes/category.php

@@ -68 +68 @@
     $where .= $exclusions;
 
-    if ( $hide_empty ) {
+    if ( $hide_empty && !$hierarchical ) {
         if ( 'link' == $type )
             $where .= ' AND link_count > 0';
@@ -104 +104 @@
         $categories = & _get_cat_children($child_of, $categories);
 
+    // Update category counts to include children.
+    if ( $hierarchical ) {
+        foreach ( $categories as $k => $category ) {
+            $progeny = $category->category_count;
+            if ( $children = _get_cat_children($category->cat_ID, $categories) ) {
+                foreach ( $children as $child )
+                    $progeny += $child->category_count;
+            }
+            if ( !$progeny && $hide_empty )
+                unset($categories[$k]);
+            else
+                $categories[$k]->category_count = $progeny;
+        }
+    }
+    reset ( $categories );
+
     return apply_filters('get_categories', $categories, $r);
 }