Changeset 37860

Timestamp:

06/25/2016 04:22:55 PM (10 years ago)

Author:

boonebgorges

Message:

Fix orderby meta handling for WP_Term_Query.

In order to allow meta-related values of orderby to be handled properly,
the term query's meta_query object must run its get_sql() method before
orderby parsing.

Fixing this bug required addressing another bug in WP_Meta_Query, which
caused the table alias index not to be reset when calling get_sql()
multiple times on the same object.

Props littler.chicken.
Fixes #37151.

Location:

trunk

Files:

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

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

@@ -328 +328 @@
                 }
 
+                $this->table_aliases = array();
+
                 $this->meta_table     = $meta_table;
                 $this->meta_id_column = sanitize_key( $type . '_id' );

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

@@ -815 +815 @@
                 $orderby = '';
 
+                // Tell the meta query to generate its SQL, so we have access to table aliases.
+                $this->meta_query->get_sql( 'term', 't', 'term_id' );
                 $meta_clauses = $this->meta_query->get_clauses();
                 if ( ! $meta_clauses || ! $orderby_raw ) {

trunk/tests/phpunit/tests/term/query.php

@@ -62 +62 @@
                 $this->assertEqualSets( array( $terms[0], $terms[2] ), $q->terms );
         }
+
+        /**
+         * @ticket 37151
+         */
+        public function test_order_by_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', 10 );
+                add_term_meta( $terms[1], 'foo', 1 );
+                add_term_meta( $terms[2], 'foo', 100 );
+
+                $q = new WP_Term_Query( array(
+                        'taxonomy' => array( 'wptests_tax' ),
+                        'fields' => 'ids',
+                        'hide_empty' => false,
+                        'meta_key' => 'foo',
+                        'orderby' => 'meta_value_num',
+                ) );
+
+                $found = array_map( 'intval', $q->terms );
+                $this->assertSame( array( $terms[1], $terms[0], $terms[2] ), $found );
+        }
 }