Changeset 27458

Timestamp:

03/07/2014 07:29:01 PM (11 years ago)

Author:

wonderboymusic

Message:

In get_terms(), leverage get_term_children() over _get_term_children() when making sure to show empty terms that have children in a hierarchical taxonomy while avoiding duplicates.

Adds unit test for child_of param. Adjusts unit tests for get_terms().

See [27108] and [27125].
Props SergeyBiryukov.
Fixes #27123.

Location:

trunk

Files:

• src/wp-includes/taxonomy.php (modified) (2 diffs)
• tests/phpunit/tests/term/getTerms.php (modified) (3 diffs)

trunk/src/wp-includes/taxonomy.php

@@ -1478 +1478 @@
         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
@@ -2924 +2928 @@
 
         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;
         }

trunk/tests/phpunit/tests/term/getTerms.php

@@ -277 +277 @@
 
         $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' ) );
     }
@@ -297 +297 @@
 
         $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' ) );
 
@@ -321 +321 @@
 
         $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 ) );
+    }
 }