From ba445c0a59c8b3aa0a13354afa8094094f0b5753 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 28 Jul 2020 14:23:04 +0000
Subject: [PATCH] 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.
Built from https://develop.svn.wordpress.org/trunk@48663


git-svn-id: http://core.svn.wordpress.org/trunk@48425 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-term-query.php | 4 ++--
 wp-includes/version.php             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-includes/class-wp-term-query.php b/wp-includes/class-wp-term-query.php
index 8b8fea4c9b..15198a3356 100644
--- a/wp-includes/class-wp-term-query.php
+++ b/wp-includes/class-wp-term-query.php
@@ -620,10 +620,10 @@ class WP_Term_Query {
 				$selects = array( 'COUNT(*)' );
 				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;
 		}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 5a999cd05c..93f5433d19 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-beta4-48662';
+$wp_version = '5.5-beta4-48663';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.