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

Return a `WP_Error` if an empty name is provided when registering a taxonomy. 

Fixes #31135
Props tyxla, MikeHansenMe


git-svn-id: https://develop.svn.wordpress.org/trunk@31449 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
John Blackbourn 2015-02-13 16:26:37 +00:00
parent 83d5751a33
commit 22fc19e06d
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -345,9 +345,9 @@ function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
);
$args = wp_parse_args( $args, $defaults );
if ( strlen( $taxonomy ) > 32 ) {
_doing_it_wrong( __FUNCTION__, __( 'Taxonomies cannot exceed 32 characters in length' ), '4.0' );
return new WP_Error( 'taxonomy_too_long', __( 'Taxonomies cannot exceed 32 characters in length' ) );
if ( empty( $taxonomy ) || strlen( $taxonomy ) > 32 ) {
_doing_it_wrong( __FUNCTION__, __( 'Taxonomy names must be between 1 and 32 characters in length.' ), '4.2' );
return new WP_Error( 'taxonomy_length_invalid', __( 'Taxonomy names must be between 1 and 32 characters in length.' ) );
}
if ( false !== $args['query_var'] && ! empty( $wp ) ) {

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

@ -153,6 +153,15 @@ class Tests_Taxonomy extends WP_UnitTestCase {
unset($GLOBALS['wp_taxonomies'][$tax]);
}
/**
* @ticket 31135
*
* @expectedIncorrectUsage register_taxonomy
*/
function test_register_short_taxonomy() {
$this->assertInstanceOf( 'WP_Error', register_taxonomy( '', 'post', array() ) );
}
/**
* @ticket 21593
*