From bd816e51823c11e072d5c3e013560ee480a887fd Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Tue, 23 Aug 2016 14:45:28 +0000
Subject: [PATCH] Taxonomy: in `get_terms()`, do not assume that legacy args
 are being passed when the only params are top-level `meta_*` values. Add keys
 in `WP_Term_Query::__construct()`.

Adds unit tests.

Props flixos90, boonebgorges.
Fixes #37568.

Built from https://develop.svn.wordpress.org/trunk@38337


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

diff --git a/wp-includes/class-wp-term-query.php b/wp-includes/class-wp-term-query.php
index 0f9919d90a..f74b31326e 100644
--- a/wp-includes/class-wp-term-query.php
+++ b/wp-includes/class-wp-term-query.php
@@ -208,6 +208,10 @@ class WP_Term_Query {
 			'cache_domain'           => 'core',
 			'update_term_meta_cache' => true,
 			'meta_query'             => '',
+			'meta_key'               => '',
+			'meta_value'             => '',
+			'meta_type'              => '',
+			'meta_compare'           => '',
 		);
 
 		if ( ! empty( $query ) ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 333b16d499..56b816fcb3 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38336';
+$wp_version = '4.7-alpha-38337';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.