<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[36485] trunk: Allow `get_terms()` results to ordered by metadata.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/36485">36485</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/36485","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-02-06 04:41:26 +0000 (Sat, 06 Feb 2016)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Allow `get_terms()` results to ordered by metadata.

The `$orderby` parameter of `get_terms()` now accepts the following values,
related to term meta:

* 'meta_value'
* 'meta_value_num'
* the value of the `$meta_key` parameter
* any key from the `$meta_query` array

This brings order-by-meta support for terms in line with post, comment, and
user queries.

As a byproduct of these improvements, `$meta_key` and `$meta_value` parameters
have been introduced to `get_terms()`. They interact with `$meta_query` in the
same way as in `WP_Query` and other query classes.

Props jadpm, eherman24.
Fixes <a href="https://core.trac.wordpress.org/ticket/34996">#34996</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunktestsphpunitteststermgetTermsphp">trunk/tests/phpunit/tests/term/getTerms.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludestaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy.php        2016-02-06 03:57:33 UTC (rev 36484)
+++ trunk/src/wp-includes/taxonomy.php  2016-02-06 04:41:26 UTC (rev 36485)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1060,6 +1060,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @since 4.4.0 Introduced the ability to pass 'term_id' as an alias of 'id' for the `orderby` parameter.
</span><span class="cx" style="display: block; padding: 0 10px">  *              Introduced the 'meta_query' and 'update_term_meta_cache' parameters. Converted to return
</span><span class="cx" style="display: block; padding: 0 10px">  *              a list of WP_Term objects.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.5.0 Introduced 'meta_key' and 'meta_value' parameters. Introduced the ability to order results by metadata.
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @global wpdb  $wpdb WordPress database abstraction object.
</span><span class="cx" style="display: block; padding: 0 10px">  * @global array $wp_filter
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1071,7 +1072,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">  *     @type string       $orderby                Field(s) to order terms by. Accepts term fields ('name', 'slug',
</span><span class="cx" style="display: block; padding: 0 10px">  *                                                'term_group', 'term_id', 'id', 'description'), 'count' for term
</span><span class="cx" style="display: block; padding: 0 10px">  *                                                taxonomy count, 'include' to match the 'order' of the $include param,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *                                                or 'none' to skip ORDER BY. Defaults to 'name'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *                                                'meta_value', 'meta_value_num', the value of `$meta_key`, the array
+ *                                                keys of `$meta_query`, or 'none' to omit the ORDER BY clause.
+ *                                                Defaults to 'name'.
</ins><span class="cx" style="display: block; padding: 0 10px">  *     @type string       $order                  Whether to order terms in ascending or descending order.
</span><span class="cx" style="display: block; padding: 0 10px">  *                                                Accepts 'ASC' (ascending) or 'DESC' (descending).
</span><span class="cx" style="display: block; padding: 0 10px">  *                                                Default 'ASC'.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1119,6 +1122,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  *     @type bool         $update_term_meta_cache Whether to prime meta caches for matched terms. Default true.
</span><span class="cx" style="display: block; padding: 0 10px">  *     @type array        $meta_query             Meta query clauses to limit retrieved terms by.
</span><span class="cx" style="display: block; padding: 0 10px">  *                                                See `WP_Meta_Query`. Default empty.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *     @type string       $meta_key               Limit terms to those matching a specific metadata key. Can be used in
+ *                                                conjunction with `$meta_value`.
+ *     @type string       $meta_value             Limit terms to those matching a specific metadata value. Usually used
+ *                                                in conjunction with `$meta_key`.
</ins><span class="cx" style="display: block; padding: 0 10px">  * }
</span><span class="cx" style="display: block; padding: 0 10px">  * @return array|int|WP_Error List of WP_Term instances and their children. Will return WP_Error, if any of $taxonomies
</span><span class="cx" style="display: block; padding: 0 10px">  *                            do not exist.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1414,13 +1421,53 @@
</span><span class="cx" style="display: block; padding: 0 10px">        // Meta query support.
</span><span class="cx" style="display: block; padding: 0 10px">        $join = '';
</span><span class="cx" style="display: block; padding: 0 10px">        $distinct = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( ! empty( $args['meta_query'] ) ) {
-               $mquery = new WP_Meta_Query( $args['meta_query'] );
-               $mq_sql = $mquery->get_sql( 'term', 't', 'term_id' );
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        $mquery = new WP_Meta_Query();
+       $mquery->parse_query_vars( $args );
+       $mq_sql = $mquery->get_sql( 'term', 't', 'term_id' );
+       $meta_clauses = $mquery->get_clauses();
+
+       if ( ! empty( $meta_clauses ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 $join  .= $mq_sql['join'];
</span><span class="cx" style="display: block; padding: 0 10px">                $where .= $mq_sql['where'];
</span><span class="cx" style="display: block; padding: 0 10px">                $distinct .= "DISTINCT";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+               // 'orderby' support.
+               $allowed_keys = array();
+               $primary_meta_key   = null;
+               $primary_meta_query = reset( $meta_clauses );
+               if ( ! empty( $primary_meta_query['key'] ) ) {
+                       $primary_meta_key = $primary_meta_query['key'];
+                       $allowed_keys[] = $primary_meta_key;
+               }
+               $allowed_keys[] = 'meta_value';
+               $allowed_keys[] = 'meta_value_num';
+               $allowed_keys   = array_merge( $allowed_keys, array_keys( $meta_clauses ) );
+
+               if ( ! empty( $args['orderby'] ) && in_array( $args['orderby'], $allowed_keys ) ) {
+                       switch( $args['orderby'] ) {
+                               case $primary_meta_key:
+                               case 'meta_value':
+                                       if ( ! empty( $primary_meta_query['type'] ) ) {
+                                               $orderby = "ORDER BY CAST({$primary_meta_query['alias']}.meta_value AS {$primary_meta_query['cast']})";
+                                       } else {
+                                               $orderby = "ORDER BY {$primary_meta_query['alias']}.meta_value";
+                                       }
+                                       break;
+
+                               case 'meta_value_num':
+                                       $orderby = "ORDER BY {$primary_meta_query['alias']}.meta_value+0";
+                                       break;
+
+                               default:
+                                       if ( array_key_exists( $args['orderby'], $meta_clauses ) ) {
+                                               // $orderby corresponds to a meta_query clause.
+                                               $meta_clause = $meta_clauses[ $args['orderby'] ];
+                                               $orderby = "ORDER BY CAST({$meta_clause['alias']}.meta_value AS {$meta_clause['cast']})";
+                                       }
+                                       break;
+                       }
+               }
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        $selects = array();
</span></span></pre></div>
<a id="trunktestsphpunitteststermgetTermsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/getTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getTerms.php       2016-02-06 03:57:33 UTC (rev 36484)
+++ trunk/tests/phpunit/tests/term/getTerms.php 2016-02-06 04:41:26 UTC (rev 36485)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1233,6 +1233,337 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( array( $t1, $t2, $t3 ), $found );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        /**
+        * @ticket 34996
+        */
+       public function test_orderby_meta_value() {
+               register_taxonomy( 'wptests_tax', 'post' );
+               $terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
+               add_term_meta( $terms[0], 'foo', 'zzz' );
+               add_term_meta( $terms[0], 'fee', 'ber' );
+               add_term_meta( $terms[1], 'foo', 'aaa' );
+               add_term_meta( $terms[1], 'fee', 'ber' );
+               add_term_meta( $terms[2], 'foo', 'jjj' );
+               add_term_meta( $terms[2], 'fee', 'ber' );
+
+               // Matches the first meta query clause.
+               $found = get_terms( 'wptests_tax', array(
+                       'hide_empty' => false,
+                       'meta_query' => array(
+                               'relation' => 'AND',
+                               array(
+                                       'key' => 'foo',
+                                       'compare' => 'EXISTS',
+                               ),
+                               array(
+                                       'key' => 'fee',
+                                       'compare' => 'EXISTS',
+                               ),
+                       ),
+                       'orderby' => 'meta_value',
+                       'order' => 'ASC',
+                       'fields' => 'ids',
+               ) );
+
+               $this->assertEqualSets( array( $terms[1], $terms[2], $terms[0] ), $found );
+       }
+
+       /**
+        * @ticket 34996
+        */
+       public function test_orderby_meta_value_num() {
+               register_taxonomy( 'wptests_tax', 'post' );
+               $terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
+               add_term_meta( $terms[0], 'foo', '999' );
+               add_term_meta( $terms[0], 'fee', 'ber' );
+               add_term_meta( $terms[1], 'foo', '111' );
+               add_term_meta( $terms[1], 'fee', 'ber' );
+               add_term_meta( $terms[2], 'foo', '555' );
+               add_term_meta( $terms[2], 'fee', 'ber' );
+
+               // Matches the first meta query clause.
+               $found = get_terms( 'wptests_tax', array(
+                       'hide_empty' => false,
+                       'meta_query' => array(
+                               'relation' => 'AND',
+                               array(
+                                       'key' => 'foo',
+                                       'compare' => 'EXISTS',
+                               ),
+                               array(
+                                       'key' => 'fee',
+                                       'compare' => 'EXISTS',
+                               ),
+                       ),
+                       'orderby' => 'meta_value_num',
+                       'order' => 'ASC',
+                       'fields' => 'ids',
+               ) );
+
+               $this->assertEqualSets( array( $terms[1], $terms[2], $terms[0] ), $found );
+       }
+
+       /**
+        * @ticket 34996
+        */
+       public function test_orderby_meta_value_with_meta_key() {
+               register_taxonomy( 'wptests_tax', 'post' );
+               $terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
+               add_term_meta( $terms[0], 'foo', 'bar' );
+               add_term_meta( $terms[0], 'fee', 'zzz' );
+               add_term_meta( $terms[0], 'faa', 'jjj' );
+               add_term_meta( $terms[1], 'foo', 'bar' );
+               add_term_meta( $terms[1], 'fee', 'aaa' );
+               add_term_meta( $terms[1], 'faa', 'aaa' );
+               add_term_meta( $terms[2], 'foo', 'bar' );
+               add_term_meta( $terms[2], 'fee', 'jjj' );
+               add_term_meta( $terms[2], 'faa', 'zzz' );
+
+               $found = get_terms( 'wptests_tax', array(
+                       'hide_empty' => false,
+                       'meta_key' => 'fee',
+                       'orderby' => 'meta_value',
+                       'order' => 'ASC',
+                       'fields' => 'ids',
+               ) );
+
+               $this->assertEqualSets( array( $terms[1], $terms[2], $terms[0] ), $found );
+
+               $found = get_terms( 'wptests_tax', array(
+                       'hide_empty' => false,
+                       'meta_query' => array(
+                               array(
+                                       'key' => 'foo',
+                                       'compare' => 'EXISTS',
+                               ),
+                       ),
+                       'meta_key' => 'fee',
+                       'orderby' => 'meta_value',
+                       'order' => 'ASC',
+                       'fields' => 'ids',
+               ) );
+
+               $this->assertEqualSets( array( $terms[1], $terms[2], $terms[0] ), $found );
+
+               // Matches the first meta query clause.
+               $found = get_terms( 'wptests_tax', array(
+                       'hide_empty' => false,
+                       'meta_query' => array(
+                               'relation' => 'AND',
+                               array(
+                                       'key' => 'foo',
+                                       'compare' => 'EXISTS',
+                               ),
+                               array(
+                                       'key' => 'fee',
+                                       'compare' => 'EXISTS',
+                               ),
+                       ),
+                       'meta_key' => 'fee',
+                       'orderby' => 'meta_value',
+                       'order' => 'ASC',
+                       'fields' => 'ids',
+               ) );
+
+               $this->assertEqualSets( array( $terms[1], $terms[2], $terms[0] ), $found );
+
+               // Matches the meta query clause corresponding to the 'meta_key' param.
+               $found = get_terms( 'wptests_tax', array(
+                       'hide_empty' => false,
+                       'meta_query' => array(
+                               'relation' => 'AND',
+                               array(
+                                       'key' => 'foo',
+                                       'compare' => 'EXISTS',
+                               ),
+                               array(
+                                       'key' => 'fee',
+                                       'compare' => 'EXISTS',
+                               ),
+                       ),
+                       'meta_key' => 'faa',
+                       'orderby' => 'meta_value',
+                       'order' => 'ASC',
+                       'fields' => 'ids',
+               ) );
+
+               $this->assertEqualSets( array( $terms[1], $terms[0], $terms[2] ), $found );
+       }
+
+       /**
+        * @ticket 34996
+        */
+       public function test_orderby_meta_value_num_with_meta_key() {
+               register_taxonomy( 'wptests_tax', 'post' );
+               $terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
+               add_term_meta( $terms[0], 'foo', 'bar' );
+               add_term_meta( $terms[0], 'fee', '999' );
+               add_term_meta( $terms[0], 'faa', '555' );
+               add_term_meta( $terms[1], 'foo', 'bar' );
+               add_term_meta( $terms[1], 'fee', '111' );
+               add_term_meta( $terms[1], 'faa', '111' );
+               add_term_meta( $terms[2], 'foo', 'bar' );
+               add_term_meta( $terms[2], 'fee', '555' );
+               add_term_meta( $terms[2], 'faa', '999' );
+
+               $found = get_terms( 'wptests_tax', array(
+                       'hide_empty' => false,
+                       'meta_key' => 'fee',
+                       'orderby' => 'meta_value',
+                       'order' => 'ASC',
+                       'fields' => 'ids',
+               ) );
+
+               $this->assertEqualSets( array( $terms[1], $terms[2], $terms[0] ), $found );
+
+               $found = get_terms( 'wptests_tax', array(
+                       'hide_empty' => false,
+                       'meta_query' => array(
+                               array(
+                                       'key' => 'foo',
+                                       'compare' => 'EXISTS',
+                               ),
+                       ),
+                       'meta_key' => 'fee',
+                       'orderby' => 'meta_value',
+                       'order' => 'ASC',
+                       'fields' => 'ids',
+               ) );
+
+               $this->assertEqualSets( array( $terms[1], $terms[2], $terms[0] ), $found );
+
+               $found = get_terms( 'wptests_tax', array(
+                       'hide_empty' => false,
+                       'meta_query' => array(
+                               'relation' => 'AND',
+                               array(
+                                       'key' => 'foo',
+                                       'compare' => 'EXISTS',
+                               ),
+                               array(
+                                       'key' => 'fee',
+                                       'compare' => 'EXISTS',
+                               ),
+                       ),
+                       'meta_key' => 'fee',
+                       'orderby' => 'meta_value',
+                       'order' => 'ASC',
+                       'fields' => 'ids',
+               ) );
+
+               $this->assertEqualSets( array( $terms[1], $terms[2], $terms[0] ), $found );
+
+               $found = get_terms( 'wptests_tax', array(
+                       'hide_empty' => false,
+                       'meta_query' => array(
+                               'relation' => 'AND',
+                               array(
+                                       'key' => 'foo',
+                                       'compare' => 'EXISTS',
+                               ),
+                               array(
+                                       'key' => 'fee',
+                                       'compare' => 'EXISTS',
+                               ),
+                       ),
+                       'meta_key' => 'faa',
+                       'orderby' => 'meta_value',
+                       'order' => 'ASC',
+                       'fields' => 'ids',
+               ) );
+
+               $this->assertEqualSets( array( $terms[1], $terms[0], $terms[2] ), $found );
+       }
+
+       /**
+        * @ticket 34996
+        */
+       public function test_orderby_clause_key() {
+               register_taxonomy( 'wptests_tax', 'post' );
+               $terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
+               add_term_meta( $terms[0], 'foo', 'zzz' );
+               add_term_meta( $terms[0], 'fee', 'jjj' );
+               add_term_meta( $terms[1], 'foo', 'aaa' );
+               add_term_meta( $terms[1], 'fee', 'aaa' );
+               add_term_meta( $terms[2], 'foo', 'jjj' );
+               add_term_meta( $terms[2], 'fee', 'zzz' );
+
+               $found = get_terms( 'wptests_tax', array(
+                       'hide_empty' => false,
+                       'meta_query' => array(
+                               'relation' => 'AND',
+                               'foo_key' => array(
+                                       'key' => 'foo',
+                                       'compare' => 'EXISTS',
+                               ),
+                               'fee_key' => array(
+                                       'key' => 'fee',
+                                       'compare' => 'EXISTS',
+                               ),
+                       ),
+                       'orderby' => 'foo_key',
+                       'order' => 'ASC',
+                       'fields' => 'ids',
+               ) );
+
+               $this->assertEqualSets( array( $terms[1], $terms[2], $terms[0] ), $found );
+
+               $found = get_terms( 'wptests_tax', array(
+                       'hide_empty' => false,
+                       'meta_query' => array(
+                               'relation' => 'AND',
+                               'foo_key' => array(
+                                       'key' => 'foo',
+                                       'compare' => 'EXISTS',
+                               ),
+                               'fee_key' => array(
+                                       'key' => 'fee',
+                                       'compare' => 'EXISTS',
+                               ),
+                       ),
+                       'orderby' => 'fee_key',
+                       'order' => 'ASC',
+                       'fields' => 'ids',
+               ) );
+
+               $this->assertEqualSets( array( $terms[1], $terms[0], $terms[2] ), $found );
+
+               $expected = get_terms( 'wptests_tax', array(
+                       'hide_empty' => false,
+                       'meta_query' => array(
+                               'relation' => 'AND',
+                               'foo_key' => array(
+                                       'key' => 'foo',
+                                       'compare' => 'EXISTS',
+                               ),
+                               'fee_key' => array(
+                                       'key' => 'fee',
+                                       'compare' => 'EXISTS',
+                               ),
+                       ),
+                       'fields' => 'ids',
+               ) );
+
+               $found = get_terms( 'wptests_tax', array(
+                       'hide_empty' => false,
+                       'meta_query' => array(
+                               'relation' => 'AND',
+                               'foo_key' => array(
+                                       'key' => 'foo',
+                                       'compare' => 'EXISTS',
+                               ),
+                               'fee_key' => array(
+                                       'key' => 'fee',
+                                       'compare' => 'EXISTS',
+                               ),
+                       ),
+                       'orderby' => 'faa_key',
+                       'fields' => 'ids',
+               ) );
+
+               $this->assertEqualSets( $expected, $found );
+       }
+
</ins><span class="cx" style="display: block; padding: 0 10px">         public function test_hierarchical_false_with_parent() {
</span><span class="cx" style="display: block; padding: 0 10px">                $initial_terms = $this->create_hierarchical_terms();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre>
</div>
</div>

</body>
</html>