Changeset 31284 for trunk/src/wp-includes/taxonomy.php

Timestamp:

01/26/2015 06:08:59 PM (10 years ago)

Author:

boonebgorges

Message:

Ensure that 'pad_counts' is not discarded when the first of multiple taxonomies passed to get_terms() is non-hierarchical.

See #31118.

File:

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

trunk/src/wp-includes/taxonomy.php

@@ -1630 +1630 @@
 
     // Save queries by not crawling the tree in the case of multiple taxes or a flat tax.
-    if ( ! $single_taxonomy || ! is_taxonomy_hierarchical( reset( $taxonomies ) ) ) {
+    $has_hierarchical_tax = false;
+    foreach ( $taxonomies as $_tax ) {
+        if ( is_taxonomy_hierarchical( $_tax ) ) {
+            $has_hierarchical_tax = true;
+        }
+    }
+
+    if ( ! $has_hierarchical_tax ) {
         $args['hierarchical'] = false;
         $args['pad_counts'] = false;
@@ -1964 +1971 @@
     // Update term counts to include children.
     if ( $args['pad_counts'] && 'all' == $_fields ) {
-        _pad_term_counts( $terms, reset( $taxonomies ) );
+        foreach ( $taxonomies as $_tax ) {
+            _pad_term_counts( $terms, $_tax );
+        }
     }
     // Make sure we show empty categories that have children.