Skip to content

Prevent PHP warning reading property on null in WP_Query::is_singular() #3142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
remyperona wants to merge 3 commits into
base: trunk
Choose a base branch
from
Open

Prevent PHP warning reading property on null in WP_Query::is_singular() #3142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5194c10
prevent PHP warning reading property on null
remyperona Aug 26, 2022
4e60ac9
return false when queried object is null
remyperona Sep 30, 2022
565ea04
add test for is_singular()
remyperona Sep 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/wp-includes/class-wp-query.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4464,6 +4464,10 @@ public function is_singular( $post_types = '' ) {

$post_obj = $this->get_queried_object();

if ( null === $post_obj ) {
return false;
}

return in_array( $post_obj->post_type, (array) $post_types, true );
}

Expand Down
16 changes: 16 additions & 0 deletions tests/phpunit/tests/query.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,4 +769,20 @@ static function() {
$this->assertArrayHasKey( 'join', $posts_clauses_request );
$this->assertSame( '/* posts_join_request */', $posts_clauses_request['join'] );
}

/**
* Tests that is_singular() returns false for an undefined post object.
*
* @ticket 56188
*
* @covers ::is_singular
*/
public function test_is_singular_should_return_false_for_an_undefined_post_object() {
$query = new WP_Query;

$query->init();
$query->set( 'is_singular', true );

$this->assertFalse( $query->is_singular( 'a_post_type' ) );
}
}