Changeset 31450

Timestamp:

02/13/2015 04:42:36 PM (10 years ago)

Author:

johnbillion

Message:

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

Fixes #31134
Props tyxla, MikeHansenMe

Location:

trunk

Files:

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

trunk/src/wp-includes/post.php

@@ -1343 +1343 @@
     $args->name = $post_type;
 
-    if ( strlen( $post_type ) > 20 ) {
-        _doing_it_wrong( __FUNCTION__, __( 'Post types cannot exceed 20 characters in length' ), '4.0' );
-        return new WP_Error( 'post_type_too_long', __( 'Post types cannot exceed 20 characters in length' ) );
+    if ( empty( $post_type ) || strlen( $post_type ) > 20 ) {
+        _doing_it_wrong( __FUNCTION__, __( 'Post type names must be between 1 and 20 characters in length.' ), '4.2' );
+        return new WP_Error( 'post_type_length_invalid', __( 'Post type names must be between 1 and 20 characters in length.' ) );
     }
 

trunk/tests/phpunit/tests/post/types.php

@@ -18 +18 @@
 
         _unregister_post_type( 'foo' );
+    }
+
+    /**
+     * @ticket 31134
+     *
+     * @expectedIncorrectUsage register_post_type
+     */
+    function test_register_post_type_length_long() {
+        // post type too long
+        $this->assertInstanceOf( 'WP_Error', register_post_type( 'abcdefghijklmnopqrstuvwxyz0123456789' ) );
+    }
+
+    /**
+     * @ticket 31134
+     *
+     * @expectedIncorrectUsage register_post_type
+     */
+    function test_register_post_type_length_short() {
+        // post type too short
+        $this->assertInstanceOf( 'WP_Error', register_post_type( '' ) );
     }