sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

git-svn-id: https://develop.svn.wordpress.org/trunk@35227 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Boone Gorges 2015-10-16 21:41:51 +00:00
parent 61edcd5021
commit f22ba848df
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-includes/taxonomy-functions.php
View File

@ -751,9 +751,9 @@ function get_term( $term, $taxonomy = '', $output = OBJECT, $filter = 'raw' ) {
// If there are two terms with the same ID, split the other one to a new term.
$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.
} else {

8
tests/phpunit/tests/term/getTerm.php
View File

@ -106,4 +106,12 @@ class Tests_Term_GetTerm extends WP_UnitTestCase {
$this->assertInternalType( 'int', $found->count );
$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' ) );
}
}