Changeset 34100

Timestamp:

09/14/2015 12:02:05 AM (11 years ago)

Author:

wonderboymusic

Message:

Check if the $post_type passed to get_post_type_object() is a scalar value. Non-scalars were producing PHP warnings.

Adds unit tests.

Props Kloon.
Fixes #30013.

Location:

trunk

Files:

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

trunk/src/wp-includes/post-functions.php

@@ -836 +836 @@
         global $wp_post_types;
 
-        if ( empty($wp_post_types[$post_type]) )
+        if ( ! is_scalar( $post_type ) || empty( $wp_post_types[ $post_type ] ) ) {
                 return null;
-
-        return $wp_post_types[$post_type];
+        }
+
+        return $wp_post_types[ $post_type ];
 }
 

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

@@ -123 +123 @@
         }
 
+
+        /**
+         * @ticket 30013
+         */
+        public function test_get_post_type_object_with_non_scalar_values() {
+                $this->assertFalse( post_type_exists( 'foo' ) );
+
+                register_post_type( 'foo' );
+
+                $this->assertTrue( post_type_exists( 'foo' ) );
+
+                $this->assertNotNull( get_post_type_object( 'foo' ) );
+                $this->assertNull( get_post_type_object( array() ) );
+                $this->assertNull( get_post_type_object( array( 'foo' ) ) );
+                $this->assertNull( get_post_type_object( new stdClass ) );
+
+                _unregister_post_type( 'foo' );
+
+                $this->assertFalse( post_type_exists( 'foo' ) );
+        }
 }