Changeset 31449

Timestamp:

02/13/2015 04:26:37 PM (12 years ago)

Author:

johnbillion

Message:

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

Fixes #31135
Props tyxla, MikeHansenMe

Location:

trunk

Files:

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

trunk/src/wp-includes/taxonomy.php

@@ -346 +346 @@
         $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.' ) );
         }
 

trunk/tests/phpunit/tests/taxonomy.php

@@ -155 +155 @@
 
         /**
+         * @ticket 31135
+         *
+         * @expectedIncorrectUsage register_taxonomy
+         */
+        function test_register_short_taxonomy() {
+                $this->assertInstanceOf( 'WP_Error', register_taxonomy( '', 'post', array() ) );
+        }
+
+        /**
          * @ticket 21593
          *