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

Timestamp:

02/06/2014 05:44:50 PM (11 years ago)

Author:

wonderboymusic

Message:

In get_terms(), don't set automatically hierarchical to false when parent => 0 is passed. The default value for parent is ''.

In _get_term_children(), don't skip a top-level term without first including its children in the returned term list. Ironically, the call to _get_term_children() in get_terms() has a comment stating "Make sure we show empty categories that have children.", but it didn't work if you were retrieving top-level categories only.

All unit tests pass. Added a unit test based on the use case described in this ticket.

Fixes #26903.

File:

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

trunk/src/wp-includes/taxonomy.php

@@ -1280 +1280 @@
     $args['offset'] = absint( $args['offset'] );
     if ( !$single_taxonomy || ! is_taxonomy_hierarchical( reset( $taxonomies ) ) ||
-        '' !== $args['parent'] ) {
+        ( '' !== $args['parent'] && 0 !== $args['parent'] ) ) {
         $args['child_of'] = 0;
         $args['hierarchical'] = false;
@@ -3003 +3003 @@
         }
 
-        if ( $term->term_id == $term_id )
+        if ( $term->term_id == $term_id ) {
+            if ( isset( $has_children[$term_id] ) ) {
+                foreach ( $has_children[$term_id] as $t_id ) {
+                    if ( $use_id ) {
+                        $term_list[] = $t_id;
+                    } else {
+                        $term_list[] = get_term( $t_id, $taxonomy );
+                    }
+                }
+            }
             continue;
+        }
 
         if ( $term->parent == $term_id ) {
@@ -3525 +3535 @@
  * Determine if a post's cache for the passed taxonomy
  *  is in sync.
- * 
+ *
  * @since 3.9.0
  *