Changeset 36402

Timestamp:

01/26/2016 02:36:32 AM (11 years ago)

Author:

boonebgorges

Message:

Allow is_post_type_viewable() to accept a post type name.

Previously, it accepted only a post type object.

Props spacedmonkey.
Fixes #35609.

Location:

trunk

Files:

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

trunk/src/wp-includes/post.php

@@ -1666 +1666 @@
  *
  * @since 4.4.0
- *
- * @param object $post_type_object Post type object.
+ * @since 4.5.0 Added the ability to pass a post type name in addition to object.
+ *
+ * @param object $post_type Post type name or object.
  * @return bool Whether the post type should be considered viewable.
  */
-function is_post_type_viewable( $post_type_object ) {
-        return $post_type_object->publicly_queryable || ( $post_type_object->_builtin && $post_type_object->public );
+function is_post_type_viewable( $post_type ) {
+        if ( is_scalar( $post_type ) ) {
+                $post_type = get_post_type_object( $post_type );
+                if ( ! $post_type ) {
+                        return false;
+                }
+        }
+
+        return $post_type->publicly_queryable || ( $post_type->_builtin && $post_type->public );
 }
 

trunk/tests/phpunit/tests/post/isPostTypeViewable.php

@@ -72 +72 @@
                 $this->assertTrue( is_post_type_viewable( $page ) );
         }
+
+        /**
+         * @ticket 35609
+         */
+        public function test_should_accept_post_type_name() {
+                register_post_type( 'wptests_pt', array(
+                        'publicly_queryable' => true,
+                        '_builtin' => false,
+                        'public' => false,
+                ) );
+
+                $this->assertTrue( is_post_type_viewable( 'wptests_pt' ) );
+        }
+
+        /**
+         * @ticket 35609
+         */
+        public function test_should_return_false_for_bad_post_type_name() {
+                $this->assertFalse( is_post_type_viewable( 'foo' ) );
+        }
 }