Changeset 31270

Timestamp:

01/23/2015 02:56:04 PM (10 years ago)

Author:

boonebgorges

Message:

Introduce 'parent' parameter to wp_get_object_terms().

Props mikeschinkel.
Fixes #15675.

Location:

trunk

Files:

• src/wp-includes/taxonomy.php (modified) (4 diffs)
• tests/phpunit/tests/term/wpGetObjectTerms.php (modified) (1 diff)

trunk/src/wp-includes/taxonomy.php

@@ -2556 +2556 @@
  * @since 2.3.0
  * @since 4.2.0 Added support for 'taxonomy', 'parent', and 'term_taxonomy_id' values of `$orderby`.
+ *              Introduced `$parent` parameter.
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -2570 +2571 @@
  *                           term objects being returned, 'ids' will return an array of integers, and 'names' an array
  *                           of strings.
+ *     @type int    $parent  Optional. Limit results to the direct children of a given term ID.
  * }
  * @return array|WP_Error The requested term data or empty array if no terms found.
@@ -2592 +2594 @@
     $object_ids = array_map('intval', $object_ids);
 
-    $defaults = array('orderby' => 'name', 'order' => 'ASC', 'fields' => 'all');
+    $defaults = array(
+        'orderby' => 'name',
+        'order'   => 'ASC',
+        'fields'  => 'all',
+        'parent'  => '',
+    );
     $args = wp_parse_args( $args, $defaults );
 
@@ -2653 +2660 @@
         $select_this = 't.*, tt.*, tr.object_id';
     }
-    $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id INNER JOIN $wpdb->term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy IN ($taxonomies) AND tr.object_id IN ($object_ids) $orderby $order";
+
+    $where = array(
+        "tt.taxonomy IN ($taxonomies)",
+        "tr.object_id IN ($object_ids)",
+    );
+
+    if ( '' !== $args['parent'] ) {
+        $where[] = $wpdb->prepare( 'tt.parent = %d', $args['parent'] );
+    }
+
+    $where = implode( ' AND ', $where );
+
+    $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id INNER JOIN $wpdb->term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE $where $orderby $order";
 
     $objects = false;

trunk/tests/phpunit/tests/term/wpGetObjectTerms.php

@@ -357 +357 @@
     }
 
+    /**
+     * @ticket 15675
+     */
+    public function test_parent() {
+        $t1 = $this->factory->term->create( array(
+            'taxonomy' => $this->taxonomy,
+        ) );
+        $t2 = $this->factory->term->create( array(
+            'taxonomy' => $this->taxonomy,
+        ) );
+        $t3 = $this->factory->term->create( array(
+            'taxonomy' => $this->taxonomy,
+            'parent' => $t1,
+        ) );
+        $t4 = $this->factory->term->create( array(
+            'taxonomy' => $this->taxonomy,
+            'parent' => $t2,
+        ) );
+
+        $p = $this->factory->post->create();
+
+        wp_set_object_terms( $p, array( $t1, $t2, $t3, $t3 ), $this->taxonomy );
+
+        $found = wp_get_object_terms( $p, $this->taxonomy, array(
+            'parent' => $t1,
+            'fields' => 'ids',
+        ) );
+
+        $this->assertEquals( array( $t3 ), $found );
+    }
+
+    /**
+     * @ticket 15675
+     */
+    public function test_parent_0() {
+        $t1 = $this->factory->term->create( array(
+            'taxonomy' => $this->taxonomy,
+        ) );
+        $t2 = $this->factory->term->create( array(
+            'taxonomy' => $this->taxonomy,
+        ) );
+        $t3 = $this->factory->term->create( array(
+            'taxonomy' => $this->taxonomy,
+            'parent' => $t1,
+        ) );
+        $t4 = $this->factory->term->create( array(
+            'taxonomy' => $this->taxonomy,
+            'parent' => $t2,
+        ) );
+
+        $p = $this->factory->post->create();
+
+        wp_set_object_terms( $p, array( $t1, $t2, $t3, $t3 ), $this->taxonomy );
+
+        $found = wp_get_object_terms( $p, $this->taxonomy, array(
+            'parent' => 0,
+            'fields' => 'ids',
+        ) );
+
+        $this->assertEqualSets( array( $t1, $t2 ), $found );
+    }
+
     public function filter_get_object_terms( $terms ) {
         $term_ids = wp_list_pluck( $terms, 'term_id' );