Skip to content
Draft
Changes from all commits
Commits
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
32 changes: 22 additions & 10 deletions src/wp-includes/class-wp-query.php
Original file line number Diff line number Diff line change
Expand Up @@ -2414,7 +2414,7 @@ public function get_posts() {

// Author stuff for nice URLs.

if ( '' !== $query_vars['author_name'] ) {
if ( $this->is_non_empty_string( $query_vars['author_name'] ) ) {
if ( str_contains( $query_vars['author_name'], '/' ) ) {
$query_vars['author_name'] = explode( '/', $query_vars['author_name'] );
if ( $query_vars['author_name'][ count( $query_vars['author_name'] ) - 1 ] ) {
Expand Down Expand Up @@ -3978,18 +3978,18 @@ public function get_queried_object() {
$cat = $this->get( 'cat' );
$category_name = $this->get( 'category_name' );

if ( $cat ) {
if ( $this->is_non_empty_string( $cat ) ) {
$term = get_term( $cat, 'category' );
} elseif ( $category_name ) {
} elseif ( $this->is_non_empty_string( $category_name ) ) {
$term = get_term_by( 'slug', $category_name, 'category' );
}
} elseif ( $this->is_tag ) {
$tag_id = $this->get( 'tag_id' );
$tag = $this->get( 'tag' );

if ( $tag_id ) {
if ( $this->is_non_empty_string( $tag_id ) ) {
$term = get_term( $tag_id, 'post_tag' );
} elseif ( $tag ) {
} elseif ( $this->is_non_empty_string( $tag ) ) {
$term = get_term_by( 'slug', $tag, 'post_tag' );
}
} else {
Expand Down Expand Up @@ -4021,7 +4021,7 @@ public function get_queried_object() {
$post_type = $this->get( 'post_type' );

if ( is_array( $post_type ) ) {
$post_type = reset( $post_type );
$post_type = array_first( $post_type );
}

$this->queried_object = get_post_type_object( $post_type );
Expand All @@ -4034,12 +4034,12 @@ public function get_queried_object() {
$this->queried_object = $this->post;
$this->queried_object_id = (int) $this->post->ID;
} elseif ( $this->is_author ) {
$author = (int) $this->get( 'author' );
$author = $this->get( 'author' );
$author_name = $this->get( 'author_name' );

if ( $author ) {
$this->queried_object_id = $author;
} elseif ( $author_name ) {
if ( $this->is_non_empty_string( $author ) ) {
$this->queried_object_id = (int) $author;
} elseif ( $this->is_non_empty_string( $author_name ) ) {
$user = get_user_by( 'slug', $author_name );

if ( $user ) {
Expand All @@ -4053,6 +4053,18 @@ public function get_queried_object() {
return $this->queried_object;
}

/**
* Determines whether the provided value is a non-empty string.
*
* @since n.e.x.t
*
* @param mixed $value Value.
* @return bool
*/
private function is_non_empty_string( $value ): bool {
return is_string( $value ) && '' !== $value;
}

/**
* Retrieves the ID of the currently queried object.
*
Expand Down
Loading