Changeset 48663

Timestamp:

07/28/2020 02:21:54 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Taxonomy: Ensure the child_of argument of get_terms() works as expected with 'fields' => 'id=>name' or 'id=>slug'.

Props Howdy_McGee, deepaklalwani, planvova.
Fixes #46768.

Location:

trunk

Files:

• src/wp-includes/class-wp-term-query.php (modified) (1 diff)
• tests/phpunit/tests/term/getTerms.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-term-query.php

@@ -621 +621 @@
                                 break;
                         case 'id=>name':
-                                $selects = array( 't.term_id', 't.name', 'tt.count', 'tt.taxonomy' );
+                                $selects = array( 't.term_id', 't.name', 'tt.parent', 'tt.count', 'tt.taxonomy' );
                                 break;
                         case 'id=>slug':
-                                $selects = array( 't.term_id', 't.slug', 'tt.count', 'tt.taxonomy' );
+                                $selects = array( 't.term_id', 't.slug', 'tt.parent', 'tt.count', 'tt.taxonomy' );
                                 break;
                 }

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

@@ -721 +721 @@
 
         /**
+         * @ticket 46768
+         */
+        function test_get_terms_child_of_fields_id_name() {
+                $parent = self::factory()->category->create();
+                $child  = self::factory()->category->create(
+                        array(
+                                'parent' => $parent,
+                                'slug'   => 'test-1',
+                                'name'   => 'Test 1',
+                        )
+                );
+                $child2 = self::factory()->category->create(
+                        array(
+                                'parent' => $parent,
+                                'slug'   => 'test-2',
+                                'name'   => 'Test 2',
+                        )
+                );
+
+                $terms = get_terms(
+                        'category',
+                        array(
+                                'child_of'   => $parent,
+                                'hide_empty' => false,
+                                'fields'     => 'id=>name',
+                        )
+                );
+
+                $this->assertEquals(
+                        array(
+                                $child  => 'Test 1',
+                                $child2 => 'Test 2',
+                        ),
+                        $terms
+                );
+
+        }
+
+        /**
+         * @ticket 46768
+         */
+        function test_get_terms_child_of_fields_id_slug() {
+                $parent = self::factory()->category->create();
+                $child  = self::factory()->category->create(
+                        array(
+                                'parent' => $parent,
+                                'slug'   => 'test-1',
+                                'name'   => 'Test 1',
+                        )
+                );
+                $child2 = self::factory()->category->create(
+                        array(
+                                'parent' => $parent,
+                                'slug'   => 'test-2',
+                                'name'   => 'Test 2',
+                        )
+                );
+
+                $terms = get_terms(
+                        'category',
+                        array(
+                                'child_of'   => $parent,
+                                'hide_empty' => false,
+                                'fields'     => 'id=>slug',
+                        )
+                );
+
+                $this->assertEquals(
+                        array(
+                                $child  => 'test-1',
+                                $child2 => 'test-2',
+                        ),
+                        $terms
+                );
+        }
+
+        /**
          * @ticket 31118
          */