Changeset 54464

Timestamp:

10/10/2022 11:01:08 PM (4 years ago)

Author:

audrasjb

Message:

Query: Prevent PHP notice when get_post_type_object() returns null in is_post_type_archive().

This changeset avoids potential PHP notices caused by get_post_type_object() returning null when called inside is_post_type_archive().

Props sean212, costdev.
Fixes #56287.

Location:

trunk

Files:

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

trunk/src/wp-includes/class-wp-query.php

@@ -3936 +3936 @@
                 $post_type_object = get_post_type_object( $post_type );
 
+                if ( ! $post_type_object ) {
+                        return false;
+                }
+
                 return in_array( $post_type_object->name, (array) $post_types, true );
         }

trunk/tests/phpunit/tests/query.php

@@ -770 +770 @@
                 $this->assertSame( '/* posts_join_request */', $posts_clauses_request['join'] );
         }
+
+        /**
+         * Tests that is_post_type_archive() returns false for an undefined post type.
+         *
+         * @ticket 56287
+         *
+         * @covers ::is_post_type_archive
+         */
+        public function test_is_post_type_archive_should_return_false_for_an_undefined_post_type() {
+                global $wp_query;
+
+                $post_type = '56287-post-type';
+
+                // Force the request to be a post type archive.
+                $wp_query->is_post_type_archive = true;
+                $wp_query->set( 'post_type', $post_type );
+
+                $this->assertFalse( is_post_type_archive( $post_type ) );
+        }
 }