Changeset 38500

Timestamp:

09/01/2016 04:50:47 PM (8 years ago)

Author:

boonebgorges

Message:

Query: 'orderby=include' should support comma-separated lists.

[30052] assumed that 'include' would be an array.

Props TimothyBlynJacobs.
Fixes #37904.

Location:

trunk

Files:

• 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-term-query.php

@@ -774 +774 @@
             $orderby = 't.slug';
         } elseif ( 'include' == $_orderby && ! empty( $this->query_vars['include'] ) ) {
-            $include = implode( ',', array_map( 'absint', $this->query_vars['include'] ) );
+            $include = implode( ',', wp_parse_id_list( $this->query_vars['include'] ) );
             $orderby = "FIELD( t.term_id, $include )";
         } elseif ( 'term_group' == $_orderby ) {

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

@@ -166 +166 @@
         $this->assertNotEmpty( $q2->terms );
     }
+
+    /**
+     * @ticket 23261
+     * @ticket 37904
+     */
+    public function test_orderby_include_with_comma_separated_list() {
+        register_taxonomy( 'wptests_tax_1', 'post' );
+
+        $t1 = self::factory()->term->create_and_get( array( 'taxonomy' => 'wptests_tax_1' ) );
+        $t2 = self::factory()->term->create_and_get( array( 'taxonomy' => 'wptests_tax_1' ) );
+
+        $query = new WP_Term_Query( array(
+            'include' => "{$t1->term_id},{$t2->term_id}",
+            'orderby' => 'include',
+            'hide_empty' => false,
+        ) );
+        $terms = $query->get_terms();
+
+        $this->assertEquals( array( $t1, $t2 ), $terms );
+    }
 }