Changeset 29863

Timestamp:

10/09/2014 02:48:47 AM (11 years ago)

Author:

boonebgorges

Message:

Fix term_exists() for parent = 0.

Passing a 0 (or '0') as the 'parent' param of term_exists() should limit
results to terms with no parent.

Adds unit test.

Fixes #29851.

Location:

trunk

Files:

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

trunk/src/wp-includes/taxonomy.php

@@ -1656 +1656 @@
  * @param int|string $term The term to check
  * @param string $taxonomy The taxonomy name to use
- * @param int $parent ID of parent term under which to confine the exists search.
+ * @param int $parent Optional. ID of parent term under which to confine the exists search.
  * @return mixed Returns 0 if the term does not exist. Returns the term ID if no taxonomy is specified
  *               and the term ID exists. Returns an array of the term ID and the term taxonomy ID
  *               if the taxonomy is specified and the pairing exists.
  */
-function term_exists($term, $taxonomy = '', $parent = 0) {
+function term_exists( $term, $taxonomy = '', $parent = null ) {
     global $wpdb;
 
@@ -1687 +1687 @@
     $else_where_fields = array($term);
     if ( !empty($taxonomy) ) {
-        $parent = (int) $parent;
-        if ( $parent > 0 ) {
+        if ( is_numeric( $parent ) ) {
+            $parent = (int) $parent;
             $where_fields[] = $parent;
             $else_where_fields[] = $parent;

trunk/tests/phpunit/tests/term.php

@@ -137 +137 @@
         $this->assertInternalType( 'array', $found );
         $this->assertEquals( $t, $found['term_id'] );
+    }
+
+    /**
+     * @ticket 29851
+     */
+    public function test_term_exists_taxonomy_nonempty_parent_0_should_return_false_for_child_term() {
+        register_taxonomy( 'foo', 'post', array(
+            'hierarchical' => true,
+        ) );
+
+        $parent_term = $this->factory->term->create( array(
+            'taxonomy' => 'foo',
+        ) );
+
+        $t = $this->factory->term->create( array(
+            'taxonomy' => 'foo',
+            'parent' => $parent_term,
+            'slug' => 'child-term',
+        ) );
+
+        $found = term_exists( 'child-term', 'foo', 0 );
+
+        _unregister_taxonomy( 'foo' );
+
+        $this->assertSame( null, $found['term_id'] );
     }