Ticket #29839: 29839.diff

wp-includes/taxonomy.php

@@ -1640 +1640 @@
 
         $defaults = array('orderby' => 'name', 'order' => 'ASC',
                 'hide_empty' => true, 'exclude' => array(), 'exclude_tree' => array(), 'include' => array(),
-                'number' => '', 'fields' => 'all', 'slug' => '', 'parent' => '',
+                'number' => '', 'fields' => 'all', 'slug' => '', 'parent' => '', 'child' => '',
                 'hierarchical' => true, 'child_of' => 0, 'get' => '', 'name__like' => '', 'description__like' => '',
                 'pad_counts' => false, 'offset' => '', 'search' => '', 'cache_domain' => 'core' );
         $args = wp_parse_args( $args, $defaults );
@@ -1654 +1654 @@
                 $args['pad_counts'] = false;
         }
 
-        // 'parent' overrides 'child_of'.
-        if ( 0 < intval( $args['parent'] ) ) {
+        // 'parent' and 'child' overrides 'child_of'.
+        if ( 0 < intval( $args['parent'] ) || 0 < intval( $args['child'] ) ) {
                 $args['child_of'] = false;
         }
 
@@ -1692 +1692 @@
                 }
         }
 
+        $child = $args['child'];
+        if ( $child ) {
+                $hierarchy = _get_term_hierarchy( reset( $taxonomies ) );
+                if ( ! isset( $hierarchy[ $child ] ) ) {
+                        return $empty_array;
+                }
+        }
+
         // $args can be whatever, only use the args defined in defaults to compute the key
         $filter_key = ( has_filter('list_terms_exclusions') ) ? serialize($GLOBALS['wp_filter']['list_terms_exclusions']) : '';
         $key = md5( serialize( wp_array_slice_assoc( $args, array_keys( $defaults ) ) ) . serialize( $taxonomies ) . $filter_key );
@@ -1853 +1861 @@
         $offset = $args['offset'];
 
         // don't limit the query results when we have to descend the family tree
-        if ( $number && ! $hierarchical && ! $child_of && '' === $parent ) {
+        if ( $number && ! $hierarchical && ! $child_of && '' === $parent && '' === $child ) {
                 if ( $offset ) {
                         $limits = 'LIMIT ' . $offset . ',' . $number;
                 } else {
@@ -1951 +1959 @@
                 }
         }
 
+        if ( $child ) {
+                $children = _get_term_hierarchy( reset( $taxonomies ) );
+                if ( ! empty( $children ) ) {
+                        $terms = _get_term_children( $child, $terms, reset( $taxonomies ) );
+                        foreach ( $terms as $k => $term ) {
+                                if ( isset( $children[$term->term_id] ) )
+                                        unset($terms[$k]);
+                        }
+                }
+        }
+
         // Update term counts to include children.
         if ( $args['pad_counts'] && 'all' == $_fields ) {
                 _pad_term_counts( $terms, reset( $taxonomies ) );