Changeset 35227

Timestamp:

10/16/2015 09:41:51 PM (8 years ago)

Author:

boonebgorges

Message:

Return null from get_term() on taxonomy mismatch.

[34997] caused get_term() to return an error object in the case when
$taxonomy did not match the taxonomy of the located term. This was an
inadvertant change from the previous behavior, when get_term() would return
null in these cases.

Props dlh.
See #14162. Fixes #34332.

Location:

trunk

Files:

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

trunk/src/wp-includes/taxonomy-functions.php

@@ -752 +752 @@
         $new_term_id = _split_shared_term( $_term->term_id, $_term->term_taxonomy_id );
 
-        // If no split occurred, this is an invalid request.
+        // If no split occurred, this is an invalid request. Return null (not WP_Error) for back compat.
         if ( $new_term_id === $_term->term_id ) {
-            return new WP_Error( 'invalid_term', __( 'Empty Term' ) );
+            return null;
 
         // The term has been split. Refetch the term from the proper taxonomy.

trunk/tests/phpunit/tests/term/getTerm.php

@@ -107 +107 @@
         $this->assertInternalType( 'int', $found->term_group );
     }
+
+    /**
+     * @ticket 34332
+     */
+     public function test_should_return_null_when_provided_taxonomy_does_not_match_actual_term_taxonomy() {
+        $term_id = self::$factory->term->create( array( 'taxonomy' => 'post_tag' ) );
+        $this->assertNull( get_term( $term_id, 'category' ) );
+    }
 }