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

Filter out empty object_types in register_taxonomy_for_object_type().

Browse Source 
This prevents weird edge bugs when registering an existing taxonomy with an
object type when the taxonomy was previously associated with no object types.

Fixes #32590.

git-svn-id: https://develop.svn.wordpress.org/trunk@32709 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Boone Gorges 2015-06-08 19:44:32 +00:00
parent b3660e2731
commit 036c33caaa
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wp-includes/taxonomy.php
View File

@ -537,6 +537,9 @@ function register_taxonomy_for_object_type( $taxonomy, $object_type) {
if ( ! in_array( $object_type, $wp_taxonomies[$taxonomy]->object_type ) ) if ( ! in_array( $object_type, $wp_taxonomies[$taxonomy]->object_type ) )
$wp_taxonomies[$taxonomy]->object_type[] = $object_type; $wp_taxonomies[$taxonomy]->object_type[] = $object_type;
// Filter out empties.
$wp_taxonomies[ $taxonomy ]->object_type = array_filter( $wp_taxonomies[ $taxonomy ]->object_type );
return true; return true;
} }

13
tests/phpunit/tests/taxonomy.php
View File

@ -238,6 +238,19 @@ class Tests_Taxonomy extends WP_UnitTestCase {
_unregister_post_type( $post_type ); _unregister_post_type( $post_type );
} }
/**
* @ticket 32590
*/
public function test_register_taxonomy_for_post_type_for_taxonomy_with_no_object_type_should_filter_out_empty_object_types() {
register_taxonomy( 'wptests_tax', '' );
register_taxonomy_for_object_type( 'wptests_tax', 'post' );
$tax = get_taxonomy( 'wptests_tax' );
$expected = array( 'post' );
$this->assertEqualSets( $expected, $tax->object_type );
}
/** /**
* @ticket 25706 * @ticket 25706
*/ */