Changeset 38182 for branches/4.6

Timestamp:

08/03/2016 01:53:25 PM (8 years ago)

Author:

boonebgorges

Message:

In WP_Term_Query, accept a string value for taxonomy.

Merges [38181] to the 4.6 branch.

Props endocreative.
Props ocean90 for review.
Fixes #37545.

Location:

branches/4.6

Files:

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

branches/4.6/src/wp-includes/class-wp-term-query.php

@@ -220 +220 @@
         }
 
-        $taxonomies = isset( $query['taxonomy'] ) ? $query['taxonomy'] : null;
+        $taxonomies = isset( $query['taxonomy'] ) ? (array) $query['taxonomy'] : null;
 
         /**

branches/4.6/tests/phpunit/tests/term/query.php

@@ -5 +5 @@
  */
 class Tests_Term_Query extends WP_UnitTestCase {
+    /**
+     * @ticket 37545
+     */
+    public function test_taxonomy_should_accept_single_taxonomy_as_string() {
+        register_taxonomy( 'wptests_tax_1', 'post' );
+        register_taxonomy( 'wptests_tax_2', 'post' );
+
+        $term_1 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax_1' ) );
+        $term_2 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax_2' ) );
+
+        $q = new WP_Term_Query( array(
+            'taxonomy' => 'wptests_tax_2',
+            'fields' => 'ids',
+            'hide_empty' => false,
+        ) );
+
+        $this->assertEqualSets( array( $term_2 ), $q->terms );
+    }
+
+    public function test_taxonomy_should_accept_taxonomy_array() {
+        register_taxonomy( 'wptests_tax_1', 'post' );
+        register_taxonomy( 'wptests_tax_2', 'post' );
+
+        $term_1 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax_1' ) );
+        $term_2 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax_2' ) );
+
+        $q = new WP_Term_Query( array(
+            'taxonomy' => array( 'wptests_tax_2' ),
+            'fields' => 'ids',
+            'hide_empty' => false,
+        ) );
+
+        $this->assertEqualSets( array( $term_2 ), $q->terms );
+    }
+
     /**
      * @ticket 37074