vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-11 20:30:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
See #31118.

git-svn-id: https://develop.svn.wordpress.org/trunk@31284 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Boone Gorges
2015-01-26 18:08:59 +00:00
parent 081cff1a6e
commit fed49d226c
2 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wp-includes/taxonomy.php
+11 -2
View File
@@ -1629,7 +1629,14 @@ function get_terms( $taxonomies, $args = '' ) {
$args['offset'] = absint( $args['offset'] );
// 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;
}
@@ -1963,7 +1970,9 @@ function get_terms( $taxonomies, $args = '' ) {
// 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.
if ( $hierarchical && $args['hide_empty'] && is_array( $terms ) ) {