Ticket #27123: 27123.4.patch

src/wp-includes/taxonomy.php

@@ -1477 +1477 @@
         if ( $hierarchical && $hide_empty && is_array( $terms ) ) {
                 foreach ( $terms as $k => $term ) {
                         if ( ! $term->count ) {
-                                $children = _get_term_children( $term->term_id, $terms, reset( $taxonomies ) );
-                                if ( is_array( $children ) )
-                                        foreach ( $children as $child )
-                                                if ( $child->count )
+                                $children = get_term_children( $term->term_id, reset( $taxonomies ) );
+                                if ( is_array( $children ) ) {
+                                        foreach ( $children as $child_id ) {
+                                                $child = get_term( $child_id, reset( $taxonomies ) );
+                                                if ( $child->count ) {
                                                         continue 2;
+                                                }
+                                        }
+                                }
 
                                 // It really is empty
                                 unset($terms[$k]);
@@ -2923 +2927 @@
                 }
 
                 if ( $term->term_id == $term_id ) {
-                        if ( isset( $has_children[$term_id] ) ) {
-                                $current_id = $term_id;
-                                while ( $current_id > 0 ) {
-                                        foreach ( $has_children[$current_id] as $t_id ) {
-                                                if ( $use_id ) {
-                                                        $term_list[] = $t_id;
-                                                } else {
-                                                        $term_list[] = get_term( $t_id, $taxonomy );
-                                                }
-                                        }
-
-                                        $current_id = isset( $has_children[$t_id] ) ? $t_id : 0;
-                                }
-                        }
                         continue;
                 }
 

tests/phpunit/tests/term/getTerms.php

@@ -276 +276 @@
                 $cranberries = $this->factory->term->create( array( 'name' => 'Cranberries', 'parent' => $fruit, 'taxonomy' => $tax ) );
 
                 $terms = get_terms( $tax, array( 'parent' => 0, 'cache_domain' => $tax ) );
-                $this->assertNotEmpty( $terms );
+                $this->assertEquals( 2, count( $terms ) );
                 $this->assertEquals( wp_list_pluck( $terms, 'name' ), array( 'Cheese', 'Crackers' ) );
         }
 
@@ -296 +296 @@
                 $this->assertEquals( 1, $term->count );
 
                 $terms = get_terms( $tax, array( 'parent' => 0, 'cache_domain' => $tax ) );
-                $this->assertNotEmpty( $terms );
+                $this->assertEquals( 1, count( $terms ) );
                 $this->assertEquals( array( 'Cheese' ), wp_list_pluck( $terms, 'name' ) );
 
                 _unregister_taxonomy( $tax );
@@ -320 +320 @@
                 $this->assertEquals( 1, $term->count );
 
                 $terms = get_terms( $tax, array( 'parent' => 0, 'cache_domain' => $tax ) );
-                $this->assertNotEmpty( $terms );
+                $this->assertEquals( 1, count( $terms ) );
                 $this->assertEquals( array( 'term1' ), wp_list_pluck( $terms, 'name' ) );
 
                 _unregister_taxonomy( $tax );
         }
+
+        /**
+         * @ticket 27123
+         */
+        function test_get_terms_child_of() {
+                $parent = $this->factory->category->create();
+                $child = $this->factory->category->create( array( 'parent' => $parent ) );
+
+                $terms = get_terms( 'category', array( 'child_of' => $parent, 'hide_empty' => false ) );
+                $this->assertEquals( 1, count( $terms ) );
+        }
 }