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

Timestamp:

10/30/2014 02:11:56 AM (11 years ago)

Author:

boonebgorges

Message:

In get_terms(), do not override 'hierarchical' and 'pad_counts' when 'parent' is present.

The previous behavior resulted in descendant terms being improperly excluded
from the results when passing a 'parent', even when 'hierarchical' had been
set to true.

The patch also adds unit tests that demonstrate the various interactions
between the 'child_of', 'parent', and 'hierarchical' parameters of get_terms().

Props landakram.
Fixes #29815.

File:

• trunk/src/wp-includes/taxonomy.php (modified) (1 diff)

trunk/src/wp-includes/taxonomy.php

@@ -1629 +1629 @@
     $args['number'] = absint( $args['number'] );
     $args['offset'] = absint( $args['offset'] );
-    if ( !$single_taxonomy || ! is_taxonomy_hierarchical( reset( $taxonomies ) ) ||
-        ( '' !== $args['parent'] && 0 !== $args['parent'] ) ) {
-        $args['child_of'] = 0;
+
+    // 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 ) ) ) {
+        $args['child_of'] = false;
         $args['hierarchical'] = false;
         $args['pad_counts'] = false;
+    }
+
+    // 'parent' overrides 'child_of'.
+    if ( 0 < intval( $args['parent'] ) ) {
+        $args['child_of'] = false;
     }