enmi-conf.org: comparison wp/wp-includes/class-wp-query.php

equal deleted inserted replaced

-:7b1b88e27a20
+:48c4eec2b7e6
 * @link https://developer.wordpress.org/reference/classes/wp_query/
 *
 * @since 1.5.0
 * @since 4.5.0 Removed the `$comments_popup` property.
 */
+#[AllowDynamicProperties]
 class WP_Query {
 	/**
 	 * Query vars set by the user.
 	 *
 	/**
 	 * Taxonomy query, as passed to get_tax_sql().
 	 *
 	 * @since 3.1.0
-	 * @var WP_Tax_Query A taxonomy query instance.
+	 * @var WP_Tax_Query|null A taxonomy query instance.
 	 */
 	public $tax_query;
 	/**
 	 * Metadata query container.
 	 * @var int
 	 */
 	public $current_post = -1;
 	/**
+	 * Whether the caller is before the loop.
+	 *
+	 * @since 6.3.0
+	 * @var bool
+	 */
+	public $before_loop = true;
+	/**
 	 * Whether the loop has started and the caller is in the loop.
 	 *
 	 * @since 2.0.0
 	 * @var bool
 	 */
 	 *
 	 * @since 3.2.0
 	 * @var bool
 	 */
 	public $thumbnails_cached = false;
+	/**
+	 * Controls whether an attachment query should include filenames or not.
+	 *
+	 * @since 6.0.3
+	 * @var bool
+	 */
+	protected $allow_query_attachment_by_filename = false;
 	/**
 	 * Cached list of search stopwords.
 	 *
 	 * @since 3.7.0
 		unset( $this->queried_object );
 		unset( $this->queried_object_id );
 		$this->post_count   = 0;
 		$this->current_post = -1;
 		$this->in_the_loop  = false;
+		$this->before_loop  = true;
 		unset( $this->request );
 		unset( $this->post );
 		unset( $this->comments );
 		unset( $this->comment );
 		$this->comment_count         = 0;
 		$this->init_query_flags();
 	}
 	/**
-	 * Reparse the query vars.
+	 * Reparses the query vars.
 	 *
 	 * @since 1.5.0
 	 */
 	public function parse_query_vars() {
 		$this->parse_query();
 			'tag_slug__and',
 			'post_parent__in',
 			'post_parent__not_in',
 			'author__in',
 			'author__not_in',
+			'search_columns',
 		);
 		foreach ( $array_keys as $key ) {
 			if ( ! isset( $query_vars[ $key ] ) ) {
 				$query_vars[ $key ] = array();
 		return $query_vars;
 	}
 	/**
-	 * Parse a query string and set query type booleans.
+	 * Parses a query string and sets query type booleans.
 	 *
 	 * @since 1.5.0
 	 * @since 4.2.0 Introduced the ability to order by specific clauses of a `$meta_query`, by passing the clause's
 	 *              array key to `$orderby`.
 	 * @since 4.4.0 Introduced `$post_name__in` and `$title` parameters. `$s` was updated to support excluded
 	 *              Introduced `RAND(x)` syntax for `$orderby`, which allows an integer seed value to random sorts.
 	 * @since 4.6.0 Added 'post_name__in' support for `$orderby`. Introduced the `$lazy_load_term_meta` argument.
 	 * @since 4.9.0 Introduced the `$comment_count` parameter.
 	 * @since 5.1.0 Introduced the `$meta_compare_key` parameter.
 	 * @since 5.3.0 Introduced the `$meta_type_key` parameter.
+	 * @since 6.1.0 Introduced the `$update_menu_item_cache` parameter.
+	 * @since 6.2.0 Introduced the `$search_columns` parameter.
 	 *
 	 * @param string|array $query {
 	 *     Optional. Array or string of Query parameters.
 	 *
-	 *     @type int             $attachment_id           Attachment post ID. Used for 'attachment' post_type.
+	 *     @type int             $attachment_id          Attachment post ID. Used for 'attachment' post_type.
-	 *     @type int|string      $author                  Author ID, or comma-separated list of IDs.
+	 *     @type int|string      $author                 Author ID, or comma-separated list of IDs.
-	 *     @type string          $author_name             User 'user_nicename'.
+	 *     @type string          $author_name            User 'user_nicename'.
-	 *     @type int[]           $author__in              An array of author IDs to query from.
+	 *     @type int[]           $author__in             An array of author IDs to query from.
-	 *     @type int[]           $author__not_in          An array of author IDs not to query from.
+	 *     @type int[]           $author__not_in         An array of author IDs not to query from.
-	 *     @type bool            $cache_results           Whether to cache post information. Default true.
+	 *     @type bool            $cache_results          Whether to cache post information. Default true.
-	 *     @type int|string      $cat                     Category ID or comma-separated list of IDs (this or any children).
+	 *     @type int|string      $cat                    Category ID or comma-separated list of IDs (this or any children).
-	 *     @type int[]           $category__and           An array of category IDs (AND in).
+	 *     @type int[]           $category__and          An array of category IDs (AND in).
-	 *     @type int[]           $category__in            An array of category IDs (OR in, no children).
+	 *     @type int[]           $category__in           An array of category IDs (OR in, no children).
-	 *     @type int[]           $category__not_in        An array of category IDs (NOT in).
+	 *     @type int[]           $category__not_in       An array of category IDs (NOT in).
-	 *     @type string          $category_name           Use category slug (not name, this or any children).
+	 *     @type string          $category_name          Use category slug (not name, this or any children).
-	 *     @type array|int       $comment_count           Filter results by comment count. Provide an integer to match
+	 *     @type array|int       $comment_count          Filter results by comment count. Provide an integer to match
-	 *                                                    comment count exactly. Provide an array with integer 'value'
+	 *                                                   comment count exactly. Provide an array with integer 'value'
-	 *                                                    and 'compare' operator ('=', '!=', '>', '>=', '<', '<=' ) to
+	 *                                                   and 'compare' operator ('=', '!=', '>', '>=', '<', '<=' ) to
-	 *                                                    compare against comment_count in a specific way.
+	 *                                                   compare against comment_count in a specific way.
-	 *     @type string          $comment_status          Comment status.
+	 *     @type string          $comment_status         Comment status.
-	 *     @type int             $comments_per_page       The number of comments to return per page.
+	 *     @type int             $comments_per_page      The number of comments to return per page.
-	 *                                                    Default 'comments_per_page' option.
+	 *                                                   Default 'comments_per_page' option.
-	 *     @type array           $date_query              An associative array of WP_Date_Query arguments.
+	 *     @type array           $date_query             An associative array of WP_Date_Query arguments.
-	 *                                                    See WP_Date_Query::__construct().
+	 *                                                   See WP_Date_Query::__construct().
-	 *     @type int             $day                     Day of the month. Default empty. Accepts numbers 1-31.
+	 *     @type int             $day                    Day of the month. Default empty. Accepts numbers 1-31.
-	 *     @type bool            $exact                   Whether to search by exact keyword. Default false.
+	 *     @type bool            $exact                  Whether to search by exact keyword. Default false.
-	 *     @type string          $fields                  Post fields to query for. Accepts:
+	 *     @type string          $fields                 Post fields to query for. Accepts:
-	 *                                                    - '' Returns an array of complete post objects (`WP_Post[]`).
+	 *                                                   - '' Returns an array of complete post objects (`WP_Post[]`).
-	 *                                                    - 'ids' Returns an array of post IDs (`int[]`).
+	 *                                                   - 'ids' Returns an array of post IDs (`int[]`).
-	 *                                                    - 'id=>parent' Returns an associative array of parent post IDs,
+	 *                                                   - 'id=>parent' Returns an associative array of parent post IDs,
-	 *                                                      keyed by post ID (`int[]`).
+	 *                                                     keyed by post ID (`int[]`).
-	 *                                                    Default ''.
+	 *                                                   Default ''.
-	 *     @type int             $hour                    Hour of the day. Default empty. Accepts numbers 0-23.
+	 *     @type int             $hour                   Hour of the day. Default empty. Accepts numbers 0-23.
-	 *     @type int|bool        $ignore_sticky_posts     Whether to ignore sticky posts or not. Setting this to false
+	 *     @type int|bool        $ignore_sticky_posts    Whether to ignore sticky posts or not. Setting this to false
-	 *                                                    excludes stickies from 'post__in'. Accepts 1|true, 0|false.
+	 *                                                   excludes stickies from 'post__in'. Accepts 1|true, 0|false.
-	 *                                                    Default false.
+	 *                                                   Default false.
-	 *     @type int             $m                       Combination YearMonth. Accepts any four-digit year and month
+	 *     @type int             $m                      Combination YearMonth. Accepts any four-digit year and month
-	 *                                                    numbers 1-12. Default empty.
+	 *                                                   numbers 01-12. Default empty.
-	 *     @type string|string[] $meta_key                Meta key or keys to filter by.
+	 *     @type string|string[] $meta_key               Meta key or keys to filter by.
-	 *     @type string|string[] $meta_value              Meta value or values to filter by.
+	 *     @type string|string[] $meta_value             Meta value or values to filter by.
-	 *     @type string          $meta_compare            MySQL operator used for comparing the meta value.
+	 *     @type string          $meta_compare           MySQL operator used for comparing the meta value.
-	 *                                                    See WP_Meta_Query::__construct for accepted values and default value.
+	 *                                                   See WP_Meta_Query::__construct() for accepted values and default value.
-	 *     @type string          $meta_compare_key        MySQL operator used for comparing the meta key.
+	 *     @type string          $meta_compare_key       MySQL operator used for comparing the meta key.
-	 *                                                    See WP_Meta_Query::__construct for accepted values and default value.
+	 *                                                   See WP_Meta_Query::__construct() for accepted values and default value.
-	 *     @type string          $meta_type               MySQL data type that the meta_value column will be CAST to for comparisons.
+	 *     @type string          $meta_type              MySQL data type that the meta_value column will be CAST to for comparisons.
-	 *                                                    See WP_Meta_Query::__construct for accepted values and default value.
+	 *                                                   See WP_Meta_Query::__construct() for accepted values and default value.
-	 *     @type string          $meta_type_key           MySQL data type that the meta_key column will be CAST to for comparisons.
+	 *     @type string          $meta_type_key          MySQL data type that the meta_key column will be CAST to for comparisons.
-	 *                                                    See WP_Meta_Query::__construct for accepted values and default value.
+	 *                                                   See WP_Meta_Query::__construct() for accepted values and default value.
-	 *     @type array           $meta_query              An associative array of WP_Meta_Query arguments.
+	 *     @type array           $meta_query             An associative array of WP_Meta_Query arguments.
-	 *                                                    See WP_Meta_Query::__construct for accepted values.
+	 *                                                   See WP_Meta_Query::__construct() for accepted values.
-	 *     @type int             $menu_order              The menu order of the posts.
+	 *     @type int             $menu_order             The menu order of the posts.
-	 *     @type int             $minute                  Minute of the hour. Default empty. Accepts numbers 0-59.
+	 *     @type int             $minute                 Minute of the hour. Default empty. Accepts numbers 0-59.
-	 *     @type int             $monthnum                The two-digit month. Default empty. Accepts numbers 1-12.
+	 *     @type int             $monthnum               The two-digit month. Default empty. Accepts numbers 1-12.
-	 *     @type string          $name                    Post slug.
+	 *     @type string          $name                   Post slug.
-	 *     @type bool            $nopaging                Show all posts (true) or paginate (false). Default false.
+	 *     @type bool            $nopaging               Show all posts (true) or paginate (false). Default false.
-	 *     @type bool            $no_found_rows           Whether to skip counting the total rows found. Enabling can improve
+	 *     @type bool            $no_found_rows          Whether to skip counting the total rows found. Enabling can improve
-	 *                                                    performance. Default false.
+	 *                                                   performance. Default false.
-	 *     @type int             $offset                  The number of posts to offset before retrieval.
+	 *     @type int             $offset                 The number of posts to offset before retrieval.
-	 *     @type string          $order                   Designates ascending or descending order of posts. Default 'DESC'.
+	 *     @type string          $order                  Designates ascending or descending order of posts. Default 'DESC'.
-	 *                                                    Accepts 'ASC', 'DESC'.
+	 *                                                   Accepts 'ASC', 'DESC'.
-	 *     @type string|array    $orderby                 Sort retrieved posts by parameter. One or more options may be passed.
+	 *     @type string|array    $orderby                Sort retrieved posts by parameter. One or more options may be passed.
-	 *                                                    To use 'meta_value', or 'meta_value_num', 'meta_key=keyname' must be
+	 *                                                   To use 'meta_value', or 'meta_value_num', 'meta_key=keyname' must be
-	 *                                                    also be defined. To sort by a specific `$meta_query` clause, use that
+	 *                                                   also be defined. To sort by a specific `$meta_query` clause, use that
-	 *                                                    clause's array key. Accepts:
+	 *                                                   clause's array key. Accepts:
-	 *                                                    - 'none'
+	 *                                                   - 'none'
-	 *                                                    - 'name'
+	 *                                                   - 'name'
-	 *                                                    - 'author'
+	 *                                                   - 'author'
-	 *                                                    - 'date'
+	 *                                                   - 'date'
-	 *                                                    - 'title'
+	 *                                                   - 'title'
-	 *                                                    - 'modified'
+	 *                                                   - 'modified'
-	 *                                                    - 'menu_order'
+	 *                                                   - 'menu_order'
-	 *                                                    - 'parent'
+	 *                                                   - 'parent'
-	 *                                                    - 'ID'
+	 *                                                   - 'ID'
-	 *                                                    - 'rand'
+	 *                                                   - 'rand'
-	 *                                                    - 'relevance'
+	 *                                                   - 'relevance'
-	 *                                                    - 'RAND(x)' (where 'x' is an integer seed value)
+	 *                                                   - 'RAND(x)' (where 'x' is an integer seed value)
-	 *                                                    - 'comment_count'
+	 *                                                   - 'comment_count'
-	 *                                                    - 'meta_value'
+	 *                                                   - 'meta_value'
-	 *                                                    - 'meta_value_num'
+	 *                                                   - 'meta_value_num'
-	 *                                                    - 'post__in'
+	 *                                                   - 'post__in'
-	 *                                                    - 'post_name__in'
+	 *                                                   - 'post_name__in'
-	 *                                                    - 'post_parent__in'
+	 *                                                   - 'post_parent__in'
-	 *                                                    - The array keys of `$meta_query`.
+	 *                                                   - The array keys of `$meta_query`.
-	 *                                                    Default is 'date', except when a search is being performed, when
+	 *                                                   Default is 'date', except when a search is being performed, when
-	 *                                                    the default is 'relevance'.
+	 *                                                   the default is 'relevance'.
-	 *     @type int             $p                       Post ID.
+	 *     @type int             $p                      Post ID.
-	 *     @type int             $page                    Show the number of posts that would show up on page X of a
+	 *     @type int             $page                   Show the number of posts that would show up on page X of a
-	 *                                                    static front page.
+	 *                                                   static front page.
-	 *     @type int             $paged                   The number of the current page.
+	 *     @type int             $paged                  The number of the current page.
-	 *     @type int             $page_id                 Page ID.
+	 *     @type int             $page_id                Page ID.
-	 *     @type string          $pagename                Page slug.
+	 *     @type string          $pagename               Page slug.
-	 *     @type string          $perm                    Show posts if user has the appropriate capability.
+	 *     @type string          $perm                   Show posts if user has the appropriate capability.
-	 *     @type string          $ping_status             Ping status.
+	 *     @type string          $ping_status            Ping status.
-	 *     @type int[]           $post__in                An array of post IDs to retrieve, sticky posts will be included.
+	 *     @type int[]           $post__in               An array of post IDs to retrieve, sticky posts will be included.
-	 *     @type int[]           $post__not_in            An array of post IDs not to retrieve. Note: a string of comma-
+	 *     @type int[]           $post__not_in           An array of post IDs not to retrieve. Note: a string of comma-
-	 *                                                    separated IDs will NOT work.
+	 *                                                   separated IDs will NOT work.
-	 *     @type string          $post_mime_type          The mime type of the post. Used for 'attachment' post_type.
+	 *     @type string          $post_mime_type         The mime type of the post. Used for 'attachment' post_type.
-	 *     @type string[]        $post_name__in           An array of post slugs that results must match.
+	 *     @type string[]        $post_name__in          An array of post slugs that results must match.
-	 *     @type int             $post_parent             Page ID to retrieve child pages for. Use 0 to only retrieve
+	 *     @type int             $post_parent            Page ID to retrieve child pages for. Use 0 to only retrieve
-	 *                                                    top-level pages.
+	 *                                                   top-level pages.
-	 *     @type int[]           $post_parent__in         An array containing parent page IDs to query child pages from.
+	 *     @type int[]           $post_parent__in        An array containing parent page IDs to query child pages from.
-	 *     @type int[]           $post_parent__not_in     An array containing parent page IDs not to query child pages from.
+	 *     @type int[]           $post_parent__not_in    An array containing parent page IDs not to query child pages from.
-	 *     @type string|string[] $post_type               A post type slug (string) or array of post type slugs.
+	 *     @type string|string[] $post_type              A post type slug (string) or array of post type slugs.
-	 *                                                    Default 'any' if using 'tax_query'.
+	 *                                                   Default 'any' if using 'tax_query'.
-	 *     @type string|string[] $post_status             A post status (string) or array of post statuses.
+	 *     @type string|string[] $post_status            A post status (string) or array of post statuses.
-	 *     @type int             $posts_per_page          The number of posts to query for. Use -1 to request all posts.
+	 *     @type int             $posts_per_page         The number of posts to query for. Use -1 to request all posts.
-	 *     @type int             $posts_per_archive_page  The number of posts to query for by archive page. Overrides
+	 *     @type int             $posts_per_archive_page The number of posts to query for by archive page. Overrides
-	 *                                                    'posts_per_page' when is_archive(), or is_search() are true.
+	 *                                                   'posts_per_page' when is_archive(), or is_search() are true.
-	 *     @type string          $s                       Search keyword(s). Prepending a term with a hyphen will
+	 *     @type string          $s                      Search keyword(s). Prepending a term with a hyphen will
-	 *                                                    exclude posts matching that term. Eg, 'pillow -sofa' will
+	 *                                                   exclude posts matching that term. Eg, 'pillow -sofa' will
-	 *                                                    return posts containing 'pillow' but not 'sofa'. The
+	 *                                                   return posts containing 'pillow' but not 'sofa'. The
-	 *                                                    character used for exclusion can be modified using the
+	 *                                                   character used for exclusion can be modified using the
-	 *                                                    the 'wp_query_search_exclusion_prefix' filter.
+	 *                                                   the 'wp_query_search_exclusion_prefix' filter.
-	 *     @type int             $second                  Second of the minute. Default empty. Accepts numbers 0-59.
+	 *     @type string[]        $search_columns         Array of column names to be searched. Accepts 'post_title',
-	 *     @type bool            $sentence                Whether to search by phrase. Default false.
+	 *                                                   'post_excerpt' and 'post_content'. Default empty array.
-	 *     @type bool            $suppress_filters        Whether to suppress filters. Default false.
+	 *     @type int             $second                 Second of the minute. Default empty. Accepts numbers 0-59.
-	 *     @type string          $tag                     Tag slug. Comma-separated (either), Plus-separated (all).
+	 *     @type bool            $sentence               Whether to search by phrase. Default false.
-	 *     @type int[]           $tag__and                An array of tag IDs (AND in).
+	 *     @type bool            $suppress_filters       Whether to suppress filters. Default false.
-	 *     @type int[]           $tag__in                 An array of tag IDs (OR in).
+	 *     @type string          $tag                    Tag slug. Comma-separated (either), Plus-separated (all).
-	 *     @type int[]           $tag__not_in             An array of tag IDs (NOT in).
+	 *     @type int[]           $tag__and               An array of tag IDs (AND in).
-	 *     @type int             $tag_id                  Tag id or comma-separated list of IDs.
+	 *     @type int[]           $tag__in                An array of tag IDs (OR in).
-	 *     @type string[]        $tag_slug__and           An array of tag slugs (AND in).
+	 *     @type int[]           $tag__not_in            An array of tag IDs (NOT in).
-	 *     @type string[]        $tag_slug__in            An array of tag slugs (OR in). unless 'ignore_sticky_posts' is
+	 *     @type int             $tag_id                 Tag id or comma-separated list of IDs.
-	 *                                                    true. Note: a string of comma-separated IDs will NOT work.
+	 *     @type string[]        $tag_slug__and          An array of tag slugs (AND in).
-	 *     @type array           $tax_query               An associative array of WP_Tax_Query arguments.
+	 *     @type string[]        $tag_slug__in           An array of tag slugs (OR in). unless 'ignore_sticky_posts' is
-	 *                                                    See WP_Tax_Query->__construct().
+	 *                                                   true. Note: a string of comma-separated IDs will NOT work.
-	 *     @type string          $title                   Post title.
+	 *     @type array           $tax_query              An associative array of WP_Tax_Query arguments.
-	 *     @type bool            $update_post_meta_cache  Whether to update the post meta cache. Default true.
+	 *                                                   See WP_Tax_Query::__construct().
-	 *     @type bool            $update_post_term_cache  Whether to update the post term cache. Default true.
+	 *     @type string          $title                  Post title.
-	 *     @type bool            $lazy_load_term_meta     Whether to lazy-load term meta. Setting to false will
+	 *     @type bool            $update_post_meta_cache Whether to update the post meta cache. Default true.
-	 *                                                    disable cache priming for term meta, so that each
+	 *     @type bool            $update_post_term_cache Whether to update the post term cache. Default true.
-	 *                                                    get_term_meta() call will hit the database.
+	 *     @type bool            $update_menu_item_cache Whether to update the menu item cache. Default false.
-	 *                                                    Defaults to the value of `$update_post_term_cache`.
+	 *     @type bool            $lazy_load_term_meta    Whether to lazy-load term meta. Setting to false will
-	 *     @type int             $w                       The week number of the year. Default empty. Accepts numbers 0-53.
+	 *                                                   disable cache priming for term meta, so that each
-	 *     @type int             $year                    The four-digit year. Default empty. Accepts any four-digit year.
+	 *                                                   get_term_meta() call will hit the database.
+	 *                                                   Defaults to the value of `$update_post_term_cache`.
+	 *     @type int             $w                      The week number of the year. Default empty. Accepts numbers 0-53.
+	 *     @type int             $year                   The four-digit year. Default empty. Accepts any four-digit year.
 	 * }
 	 */
 	public function parse_query( $query = '' ) {
 		if ( ! empty( $query ) ) {
 			$this->init();
 			$qv['error'] = '404';
 		} else {
 			$qv['p'] = (int) $qv['p'];
 		}
-		$qv['page_id']  = absint( $qv['page_id'] );
+		$qv['page_id']  = is_scalar( $qv['page_id'] ) ? absint( $qv['page_id'] ) : 0;
-		$qv['year']     = absint( $qv['year'] );
+		$qv['year']     = is_scalar( $qv['year'] ) ? absint( $qv['year'] ) : 0;
-		$qv['monthnum'] = absint( $qv['monthnum'] );
+		$qv['monthnum'] = is_scalar( $qv['monthnum'] ) ? absint( $qv['monthnum'] ) : 0;
-		$qv['day']      = absint( $qv['day'] );
+		$qv['day']      = is_scalar( $qv['day'] ) ? absint( $qv['day'] ) : 0;
-		$qv['w']        = absint( $qv['w'] );
+		$qv['w']        = is_scalar( $qv['w'] ) ? absint( $qv['w'] ) : 0;
 		$qv['m']        = is_scalar( $qv['m'] ) ? preg_replace( '|[^0-9]|', '', $qv['m'] ) : '';
-		$qv['paged']    = absint( $qv['paged'] );
+		$qv['paged']    = is_scalar( $qv['paged'] ) ? absint( $qv['paged'] ) : 0;
-		$qv['cat']      = preg_replace( '|[^0-9,-]|', '', $qv['cat'] );    // Comma-separated list of positive or negative integers.
+		$qv['cat']      = preg_replace( '|[^0-9,-]|', '', $qv['cat'] ); // Array or comma-separated list of positive or negative integers.
-		$qv['author']   = preg_replace( '|[^0-9,-]|', '', $qv['author'] ); // Comma-separated list of positive or negative integers.
+		$qv['author']   = is_scalar( $qv['author'] ) ? preg_replace( '|[^0-9,-]|', '', $qv['author'] ) : ''; // Comma-separated list of positive or negative integers.
-		$qv['pagename'] = trim( $qv['pagename'] );
+		$qv['pagename'] = is_scalar( $qv['pagename'] ) ? trim( $qv['pagename'] ) : '';
-		$qv['name']     = trim( $qv['name'] );
+		$qv['name']     = is_scalar( $qv['name'] ) ? trim( $qv['name'] ) : '';
-		$qv['title']    = trim( $qv['title'] );
+		$qv['title']    = is_scalar( $qv['title'] ) ? trim( $qv['title'] ) : '';
-		if ( '' !== $qv['hour'] ) {
+		if ( is_scalar( $qv['hour'] ) && '' !== $qv['hour'] ) {
 			$qv['hour'] = absint( $qv['hour'] );
-		}
+		} else {
-		if ( '' !== $qv['minute'] ) {
+			$qv['hour'] = '';
+		}
+		if ( is_scalar( $qv['minute'] ) && '' !== $qv['minute'] ) {
 			$qv['minute'] = absint( $qv['minute'] );
-		}
+		} else {
-		if ( '' !== $qv['second'] ) {
+			$qv['minute'] = '';
+		}
+		if ( is_scalar( $qv['second'] ) && '' !== $qv['second'] ) {
 			$qv['second'] = absint( $qv['second'] );
-		}
+		} else {
-		if ( '' !== $qv['menu_order'] ) {
+			$qv['second'] = '';
+		}
+		if ( is_scalar( $qv['menu_order'] ) && '' !== $qv['menu_order'] ) {
 			$qv['menu_order'] = absint( $qv['menu_order'] );
+		} else {
+			$qv['menu_order'] = '';
 		}
 		// Fairly large, potentially too large, upper bound for search string lengths.
 		if ( ! is_scalar( $qv['s'] ) || ( ! empty( $qv['s'] ) && strlen( $qv['s'] ) > 1600 ) ) {
 			$qv['s'] = '';
 		}
 		// Compat. Map subpost to attachment.
-		if ( '' != $qv['subpost'] ) {
+		if ( is_scalar( $qv['subpost'] ) && '' != $qv['subpost'] ) {
 			$qv['attachment'] = $qv['subpost'];
 		}
-		if ( '' != $qv['subpost_id'] ) {
+		if ( is_scalar( $qv['subpost_id'] ) && '' != $qv['subpost_id'] ) {
 			$qv['attachment_id'] = $qv['subpost_id'];
 		}
-		$qv['attachment_id'] = absint( $qv['attachment_id'] );
+		$qv['attachment_id'] = is_scalar( $qv['attachment_id'] ) ? absint( $qv['attachment_id'] ) : 0;
 		if ( ( '' !== $qv['attachment'] ) || ! empty( $qv['attachment_id'] ) ) {
 			$this->is_single     = true;
 			$this->is_attachment = true;
 		} elseif ( '' !== $qv['name'] ) {
 		if ( is_admin() ) {
 			$this->is_admin = true;
 		}
-		if ( false !== strpos( $qv['feed'], 'comments-' ) ) {
+		if ( str_contains( $qv['feed'], 'comments-' ) ) {
 			$qv['feed']         = str_replace( 'comments-', '', $qv['feed'] );
 			$qv['withcomments'] = 1;
 		}
 		$this->is_singular = $this->is_single || $this->is_page || $this->is_attachment;
 		if ( $this->is_feed && ( ! empty( $qv['withcomments'] ) || ( empty( $qv['withoutcomments'] ) && $this->is_singular ) ) ) {
 			$this->is_comment_feed = true;
 		}
 		if ( ! ( $this->is_singular || $this->is_archive || $this->is_search || $this->is_feed
-				|| ( defined( 'REST_REQUEST' ) && REST_REQUEST && $this->is_main_query() )
+				|| ( wp_is_serving_rest_request() && $this->is_main_query() )
 				|| $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_robots || $this->is_favicon ) ) {
 			$this->is_home = true;
 		}
 		// Correct `is_*` for 'page_on_front' and 'page_for_posts'.
 				if ( is_array( $term ) ) {
 					$term = implode( ',', $term );
 				}
-				if ( strpos( $term, '+' ) !== false ) {
+				if ( str_contains( $term, '+' ) ) {
 					$terms = preg_split( '/[+]+/', $term );
 					foreach ( $terms as $term ) {
 						$tax_query[] = array_merge(
 							$tax_query_defaults,
 							array(
 		}
 		// Tag stuff.
 		if ( '' !== $q['tag'] && ! $this->is_singular && $this->query_vars_changed ) {
-			if ( strpos( $q['tag'], ',' ) !== false ) {
+			if ( str_contains( $q['tag'], ',' ) ) {
 				$tags = preg_split( '/[,\r\n\t ]+/', $q['tag'] );
 				foreach ( (array) $tags as $tag ) {
 					$tag                 = sanitize_term_field( 'slug', $tag, 0, 'post_tag', 'db' );
 					$q['tag_slug__in'][] = $tag;
 				}
 		$n                         = ! empty( $q['exact'] ) ? '' : '%';
 		$searchand                 = '';
 		$q['search_orderby_title'] = array();
+		$default_search_columns = array( 'post_title', 'post_excerpt', 'post_content' );
+		$search_columns         = ! empty( $q['search_columns'] ) ? $q['search_columns'] : $default_search_columns;
+		if ( ! is_array( $search_columns ) ) {
+			$search_columns = array( $search_columns );
+		}
+		/**
+		 * Filters the columns to search in a WP_Query search.
+		 *
+		 * The supported columns are `post_title`, `post_excerpt` and `post_content`.
+		 * They are all included by default.
+		 *
+		 * @since 6.2.0
+		 *
+		 * @param string[] $search_columns Array of column names to be searched.
+		 * @param string   $search         Text being searched.
+		 * @param WP_Query $query          The current WP_Query instance.
+		 */
+		$search_columns = (array) apply_filters( 'post_search_columns', $search_columns, $q['s'], $this );
+		// Use only supported search columns.
+		$search_columns = array_intersect( $search_columns, $default_search_columns );
+		if ( empty( $search_columns ) ) {
+			$search_columns = $default_search_columns;
+		}
 		/**
 		 * Filters the prefix that indicates that a search term should be excluded from results.
 		 *
 		 * @since 4.7.0
 		 *
 		 */
 		$exclusion_prefix = apply_filters( 'wp_query_search_exclusion_prefix', '-' );
 		foreach ( $q['search_terms'] as $term ) {
 			// If there is an $exclusion_prefix, terms prefixed with it should be excluded.
-			$exclude = $exclusion_prefix && ( substr( $term, 0, 1 ) === $exclusion_prefix );
+			$exclude = $exclusion_prefix && str_starts_with( $term, $exclusion_prefix );
 			if ( $exclude ) {
 				$like_op  = 'NOT LIKE';
 				$andor_op = 'AND';
 				$term     = substr( $term, 1 );
 			} else {
 			if ( $n && ! $exclude ) {
 				$like                        = '%' . $wpdb->esc_like( $term ) . '%';
 				$q['search_orderby_title'][] = $wpdb->prepare( "{$wpdb->posts}.post_title LIKE %s", $like );
 			}
-			$like      = $n . $wpdb->esc_like( $term ) . $n;
+			$like = $n . $wpdb->esc_like( $term ) . $n;
-			$search   .= $wpdb->prepare( "{$searchand}(({$wpdb->posts}.post_title $like_op %s) $andor_op ({$wpdb->posts}.post_excerpt $like_op %s) $andor_op ({$wpdb->posts}.post_content $like_op %s))", $like, $like, $like );
+			$search_columns_parts = array();
+			foreach ( $search_columns as $search_column ) {
+				$search_columns_parts[ $search_column ] = $wpdb->prepare( "({$wpdb->posts}.$search_column $like_op %s)", $like );
+			}
+			if ( ! empty( $this->allow_query_attachment_by_filename ) ) {
+				$search_columns_parts['attachment'] = $wpdb->prepare( "(sq1.meta_value $like_op %s)", $like );
+			}
+			$search .= "$searchand(" . implode( " $andor_op ", $search_columns_parts ) . ')';
 			$searchand = ' AND ';
 		}
 		if ( ! empty( $search ) ) {
 			$search = " AND ({$search}) ";
 		return $search;
 	}
 	/**
-	 * Check if the terms are suitable for searching.
+	 * Checks if the terms are suitable for searching.
 	 *
 	 * Uses an array of stopwords (terms) that are excluded from the separate
 	 * term matching when searching for posts. The list of English stopwords is
 	 * the approximate search engines list, and is translatable.
 	 *
 		return $checked;
 	}
 	/**
-	 * Retrieve stopwords used when parsing search terms.
+	 * Retrieves stopwords used when parsing search terms.
 	 *
 	 * @since 3.7.0
 	 *
 	 * @return string[] Stopwords.
 	 */
 			// Sentence match in 'post_title'.
 			if ( $like ) {
 				$search_orderby .= $wpdb->prepare( "WHEN {$wpdb->posts}.post_title LIKE %s THEN 1 ", $like );
 			}
-			// Sanity limit, sort as sentence when more than 6 terms
+			/*
-			// (few searches are longer than 6 terms and most titles are not).
+			 * Sanity limit, sort as sentence when more than 6 terms
+			 * (few searches are longer than 6 terms and most titles are not).
+			 */
 			if ( $num_terms < 7 ) {
 				// All words in title.
 				$search_orderby .= 'WHEN ' . implode( ' AND ', $q['search_orderby_title'] ) . ' THEN 2 ';
 				// Any word in title, not needed when $num_terms == 1.
 				if ( $num_terms > 1 ) {
 	 *
 	 * @since 1.5.0
 	 * @since 3.9.0 The `$default_value` argument was introduced.
 	 *
 	 * @param string $query_var     Query variable key.
-	 * @param mixed  $default_value Optional. Value to return if the query variable is not set. Default empty string.
+	 * @param mixed  $default_value Optional. Value to return if the query variable is not set.
+	 *                              Default empty string.
 	 * @return mixed Contents of the query variable.
 	 */
 	public function get( $query_var, $default_value = '' ) {
 		if ( isset( $this->query_vars[ $query_var ] ) ) {
 			return $this->query_vars[ $query_var ];
 		$q = &$this->query_vars;
 		// Fill again in case 'pre_get_posts' unset some vars.
 		$q = $this->fill_query_vars( $q );
+		/**
+		 * Filters whether an attachment query should include filenames or not.
+		 *
+		 * @since 6.0.3
+		 *
+		 * @param bool $allow_query_attachment_by_filename Whether or not to include filenames.
+		 */
+		$this->allow_query_attachment_by_filename = apply_filters( 'wp_allow_query_attachment_by_filename', false );
+		remove_all_filters( 'wp_allow_query_attachment_by_filename' );
 		// Parse meta query.
 		$this->meta_query = new WP_Meta_Query();
 		$this->meta_query->parse_query_vars( $q );
 		// Set a flag if a 'pre_get_posts' hook changed the query vars.
 		if ( ! isset( $q['suppress_filters'] ) ) {
 			$q['suppress_filters'] = false;
 		}
 		if ( ! isset( $q['cache_results'] ) ) {
-			if ( wp_using_ext_object_cache() ) {
+			$q['cache_results'] = true;
-				$q['cache_results'] = false;
-			} else {
-				$q['cache_results'] = true;
-			}
 		}
 		if ( ! isset( $q['update_post_term_cache'] ) ) {
 			$q['update_post_term_cache'] = true;
 		}
+		if ( ! isset( $q['update_menu_item_cache'] ) ) {
+			$q['update_menu_item_cache'] = false;
+		}
 		if ( ! isset( $q['lazy_load_term_meta'] ) ) {
 			$q['lazy_load_term_meta'] = $q['update_post_term_cache'];
+		} elseif ( $q['lazy_load_term_meta'] ) { // Lazy loading term meta only works if term caches are primed.
+			$q['update_post_term_cache'] = true;
 		}
 		if ( ! isset( $q['update_post_meta_cache'] ) ) {
 			$q['update_post_meta_cache'] = true;
 		}
 			$this->is_home = false;
 			$q['page_id']  = get_option( 'page_on_front' );
 		}
 		if ( isset( $q['page'] ) ) {
-			$q['page'] = trim( $q['page'], '/' );
+			$q['page'] = is_scalar( $q['page'] ) ? absint( trim( $q['page'], '/' ) ) : 0;
-			$q['page'] = absint( $q['page'] );
 		}
 		// If true, forcibly turns off SQL_CALC_FOUND_ROWS even when limits are present.
 		if ( isset( $q['no_found_rows'] ) ) {
 			$q['no_found_rows'] = (bool) $q['no_found_rows'];
 						$post_type[] = $pt;
 					}
 				}
 				if ( ! $post_type ) {
 					$post_type = 'any';
-				} elseif ( count( $post_type ) == 1 ) {
+				} elseif ( count( $post_type ) === 1 ) {
 					$post_type = $post_type[0];
+				} else {
+					// Sort post types to ensure same cache key generation.
+					sort( $post_type );
 				}
 				$post_status_join = true;
 			} elseif ( in_array( 'attachment', (array) $post_type, true ) ) {
 				$post_status_join = true;
 					unset( $the_tag );
 				}
 			}
 		}
-		if ( ! empty( $this->tax_query->queries ) || ! empty( $this->meta_query->queries ) ) {
+		if ( ! empty( $this->tax_query->queries ) || ! empty( $this->meta_query->queries ) || ! empty( $this->allow_query_attachment_by_filename ) ) {
 			$groupby = "{$wpdb->posts}.ID";
 		}
 		// Author/user stuff.
 		}
 		// Author stuff for nice URLs.
 		if ( '' !== $q['author_name'] ) {
-			if ( strpos( $q['author_name'], '/' ) !== false ) {
+			if ( str_contains( $q['author_name'], '/' ) ) {
 				$q['author_name'] = explode( '/', $q['author_name'] );
 				if ( $q['author_name'][ count( $q['author_name'] ) - 1 ] ) {
 					$q['author_name'] = $q['author_name'][ count( $q['author_name'] ) - 1 ]; // No trailing slash.
 				} else {
 					$q['author_name'] = $q['author_name'][ count( $q['author_name'] ) - 2 ]; // There was a trailing slash.
 		if ( isset( $q['post_mime_type'] ) && '' !== $q['post_mime_type'] ) {
 			$whichmimetype = wp_post_mime_type_where( $q['post_mime_type'], $wpdb->posts );
 		}
 		$where .= $search . $whichauthor . $whichmimetype;
+		if ( ! empty( $this->allow_query_attachment_by_filename ) ) {
+			$join .= " LEFT JOIN {$wpdb->postmeta} AS sq1 ON ( {$wpdb->posts}.ID = sq1.post_id AND sq1.meta_key = '_wp_attached_file' )";
+		}
 		if ( ! empty( $this->meta_query->queries ) ) {
 			$clauses = $this->meta_query->get_sql( 'post', $wpdb->posts, 'ID', $this );
 			$join   .= $clauses['join'];
 			$where  .= $clauses['where'];
 				$skip_post_status = true;
 			} else {
 				$post_type_where = " AND {$wpdb->posts}.post_type IN ('" . implode( "', '", array_map( 'esc_sql', $in_search_post_types ) ) . "')";
 			}
 		} elseif ( ! empty( $post_type ) && is_array( $post_type ) ) {
+			// Sort post types to ensure same cache key generation.
+			sort( $post_type );
 			$post_type_where = " AND {$wpdb->posts}.post_type IN ('" . implode( "', '", esc_sql( $post_type ) ) . "')";
 		} elseif ( ! empty( $post_type ) ) {
 			$post_type_where  = $wpdb->prepare( " AND {$wpdb->posts}.post_type = %s", $post_type );
 			$post_type_object = get_post_type_object( $post_type );
 		} elseif ( $this->is_attachment ) {
 			} else {
 				$queried_post_types = array( 'post' );
 			}
 			if ( ! empty( $queried_post_types ) ) {
+				sort( $queried_post_types );
 				$status_type_clauses = array();
 				foreach ( $queried_post_types as $queried_post_type ) {
 					$queried_post_type_object = get_post_type_object( $queried_post_type );
 			$key          = md5( $comments_request );
 			$last_changed = wp_cache_get_last_changed( 'comment' ) . ':' . wp_cache_get_last_changed( 'posts' );
 			$cache_key   = "comment_feed:$key:$last_changed";
-			$comment_ids = wp_cache_get( $cache_key, 'comment' );
+			$comment_ids = wp_cache_get( $cache_key, 'comment-queries' );
 			if ( false === $comment_ids ) {
 				$comment_ids = $wpdb->get_col( $comments_request );
-				wp_cache_add( $cache_key, $comment_ids, 'comment' );
+				wp_cache_add( $cache_key, $comment_ids, 'comment-queries' );
 			}
-			_prime_comment_caches( $comment_ids, false );
+			_prime_comment_caches( $comment_ids );
 			// Convert to WP_Comment.
 			/** @var WP_Comment[] */
 			$this->comments      = array_map( 'get_comment', $comment_ids );
 			$this->comment_count = count( $this->comments );
 		$found_rows = '';
 		if ( ! $q['no_found_rows'] && ! empty( $limits ) ) {
 			$found_rows = 'SQL_CALC_FOUND_ROWS';
 		}
-		$old_request = "
+		/*
-			SELECT $found_rows $distinct $fields
+		 * Beginning of the string is on a new line to prevent leading whitespace.
-			FROM {$wpdb->posts} $join
+		 *
-			WHERE 1=1 $where
+		 * The additional indentation of subsequent lines is to ensure the SQL
-			$groupby
+		 * queries are identical to those generated when splitting queries. This
-			$orderby
+		 * improves caching of the query by ensuring the same cache key is
-			$limits
+		 * generated for the same database queries functionally.
-		";
+		 *
+		 * See https://core.trac.wordpress.org/ticket/56841.
+		 * See https://github.com/WordPress/wordpress-develop/pull/6393#issuecomment-2088217429
+		 */
+		$old_request =
+			"SELECT $found_rows $distinct $fields
+					 FROM {$wpdb->posts} $join
+					 WHERE 1=1 $where
+					 $groupby
+					 $orderby
+					 $limits";
 		$this->request = $old_request;
 		if ( ! $q['suppress_filters'] ) {
 			/**
 		 *                                    or null to allow WP to run its normal queries.
 		 * @param WP_Query             $query The WP_Query instance (passed by reference).
 		 */
 		$this->posts = apply_filters_ref_array( 'posts_pre_query', array( null, &$this ) );
+		/*
+		 * Ensure the ID database query is able to be cached.
+		 *
+		 * Random queries are expected to have unpredictable results and
+		 * cannot be cached. Note the space before `RAND` in the string
+		 * search, that to ensure against a collision with another
+		 * function.
+		 *
+		 * If `$fields` has been modified by the `posts_fields`,
+		 * `posts_fields_request`, `post_clauses` or `posts_clauses_request`
+		 * filters, then caching is disabled to prevent caching collisions.
+		 */
+		$id_query_is_cacheable = ! str_contains( strtoupper( $orderby ), ' RAND(' );
+		$cacheable_field_values = array(
+			"{$wpdb->posts}.*",
+			"{$wpdb->posts}.ID, {$wpdb->posts}.post_parent",
+			"{$wpdb->posts}.ID",
+		);
+		if ( ! in_array( $fields, $cacheable_field_values, true ) ) {
+			$id_query_is_cacheable = false;
+		}
+		if ( $q['cache_results'] && $id_query_is_cacheable ) {
+			$new_request = str_replace( $fields, "{$wpdb->posts}.*", $this->request );
+			$cache_key   = $this->generate_cache_key( $q, $new_request );
+			$cache_found = false;
+			if ( null === $this->posts ) {
+				$cached_results = wp_cache_get( $cache_key, 'post-queries', false, $cache_found );
+				if ( $cached_results ) {
+					/** @var int[] */
+					$post_ids = array_map( 'intval', $cached_results['posts'] );
+					$this->post_count    = count( $post_ids );
+					$this->found_posts   = $cached_results['found_posts'];
+					$this->max_num_pages = $cached_results['max_num_pages'];
+					if ( 'ids' === $q['fields'] ) {
+						$this->posts = $post_ids;
+						return $this->posts;
+					} elseif ( 'id=>parent' === $q['fields'] ) {
+						_prime_post_parent_id_caches( $post_ids );
+						$post_parent_cache_keys = array();
+						foreach ( $post_ids as $post_id ) {
+							$post_parent_cache_keys[] = 'post_parent:' . (string) $post_id;
+						}
+						/** @var int[] */
+						$post_parents = wp_cache_get_multiple( $post_parent_cache_keys, 'posts' );
+						foreach ( $post_parents as $cache_key => $post_parent ) {
+							$obj              = new stdClass();
+							$obj->ID          = (int) str_replace( 'post_parent:', '', $cache_key );
+							$obj->post_parent = (int) $post_parent;
+							$this->posts[] = $obj;
+						}
+						return $post_parents;
+					} else {
+						_prime_post_caches( $post_ids, $q['update_post_term_cache'], $q['update_post_meta_cache'] );
+						/** @var WP_Post[] */
+						$this->posts = array_map( 'get_post', $post_ids );
+					}
+				}
+			}
+		}
 		if ( 'ids' === $q['fields'] ) {
 			if ( null === $this->posts ) {
 				$this->posts = $wpdb->get_col( $this->request );
 			}
 			/** @var int[] */
 			$this->posts      = array_map( 'intval', $this->posts );
 			$this->post_count = count( $this->posts );
 			$this->set_found_posts( $q, $limits );
+			if ( $q['cache_results'] && $id_query_is_cacheable ) {
+				$cache_value = array(
+					'posts'         => $this->posts,
+					'found_posts'   => $this->found_posts,
+					'max_num_pages' => $this->max_num_pages,
+				);
+				wp_cache_set( $cache_key, $cache_value, 'post-queries' );
+			}
 			return $this->posts;
 		}
 		if ( 'id=>parent' === $q['fields'] ) {
 			if ( null === $this->posts ) {
 			$this->post_count = count( $this->posts );
 			$this->set_found_posts( $q, $limits );
 			/** @var int[] */
-			$r = array();
+			$post_parents       = array();
+			$post_ids           = array();
+			$post_parents_cache = array();
 			foreach ( $this->posts as $key => $post ) {
 				$this->posts[ $key ]->ID          = (int) $post->ID;
 				$this->posts[ $key ]->post_parent = (int) $post->post_parent;
-				$r[ (int) $post->ID ] = (int) $post->post_parent;
+				$post_parents[ (int) $post->ID ] = (int) $post->post_parent;
-			}
+				$post_ids[]                      = (int) $post->ID;
-			return $r;
+				$post_parents_cache[ 'post_parent:' . (string) $post->ID ] = (int) $post->post_parent;
-		}
+			}
+			// Prime post parent caches, so that on second run, there is not another database query.
+			wp_cache_add_multiple( $post_parents_cache, 'posts' );
+			if ( $q['cache_results'] && $id_query_is_cacheable ) {
+				$cache_value = array(
+					'posts'         => $post_ids,
+					'found_posts'   => $this->found_posts,
+					'max_num_pages' => $this->max_num_pages,
+				);
+				wp_cache_set( $cache_key, $cache_value, 'post-queries' );
+			}
+			return $post_parents;
+		}
+		$is_unfiltered_query = $old_request == $this->request && "{$wpdb->posts}.*" === $fields;
 		if ( null === $this->posts ) {
-			$split_the_query = ( $old_request == $this->request && "{$wpdb->posts}.*" === $fields && ! empty( $limits ) && $q['posts_per_page'] < 500 );
+			$split_the_query = (
+				$is_unfiltered_query
+				&& (
+					wp_using_ext_object_cache()
+					|| ( ! empty( $limits ) && $q['posts_per_page'] < 500 )
+				)
+			);
 			/**
 			 * Filters whether to split the query.
 			 *
 			 * Splitting the query will cause it to fetch just the IDs of the found posts
 			 * (and then individually fetch each post by ID), rather than fetching every
 			 * complete row at once. One massive result vs. many small results.
 			 *
 			 * @since 3.4.0
+			 * @since 6.6.0 Added the `$old_request` and `$clauses` parameters.
 			 *
 			 * @param bool     $split_the_query Whether or not to split the query.
 			 * @param WP_Query $query           The WP_Query instance.
+			 * @param string   $old_request     The complete SQL query before filtering.
+			 * @param string[] $clauses {
+			 *     Associative array of the clauses for the query.
+			 *
+			 *     @type string $where    The WHERE clause of the query.
+			 *     @type string $groupby  The GROUP BY clause of the query.
+			 *     @type string $join     The JOIN clause of the query.
+			 *     @type string $orderby  The ORDER BY clause of the query.
+			 *     @type string $distinct The DISTINCT clause of the query.
+			 *     @type string $fields   The SELECT clause of the query.
+			 *     @type string $limits   The LIMIT clause of the query.
+			 * }
 			 */
-			$split_the_query = apply_filters( 'split_the_query', $split_the_query, $this );
+			$split_the_query = apply_filters( 'split_the_query', $split_the_query, $this, $old_request, compact( $pieces ) );
 			if ( $split_the_query ) {
 				// First get the IDs and then fill in the objects.
-				$this->request = "
+				// Beginning of the string is on a new line to prevent leading whitespace. See https://core.trac.wordpress.org/ticket/56841.
-					SELECT $found_rows $distinct {$wpdb->posts}.ID
+				$this->request =
-					FROM {$wpdb->posts} $join
+					"SELECT $found_rows $distinct {$wpdb->posts}.ID
-					WHERE 1=1 $where
+					 FROM {$wpdb->posts} $join
-					$groupby
+					 WHERE 1=1 $where
-					$orderby
+					 $groupby
-					$limits
+					 $orderby
-				";
+					 $limits";
 				/**
 				 * Filters the Post IDs SQL request before sending.
 				 *
 				 * @since 3.4.0
 				 * @param string   $request The post ID request.
 				 * @param WP_Query $query   The WP_Query instance.
 				 */
 				$this->request = apply_filters( 'posts_request_ids', $this->request, $this );
-				$ids = $wpdb->get_col( $this->request );
+				$post_ids = $wpdb->get_col( $this->request );
-				if ( $ids ) {
+				if ( $post_ids ) {
-					$this->posts = $ids;
+					$this->posts = $post_ids;
 					$this->set_found_posts( $q, $limits );
-					_prime_post_caches( $ids, $q['update_post_term_cache'], $q['update_post_meta_cache'] );
+					_prime_post_caches( $post_ids, $q['update_post_term_cache'], $q['update_post_meta_cache'] );
 				} else {
 					$this->posts = array();
 				}
 			} else {
 				$this->posts = $wpdb->get_results( $this->request );
 		if ( $this->posts ) {
 			/** @var WP_Post[] */
 			$this->posts = array_map( 'get_post', $this->posts );
 		}
+		$unfiltered_posts = $this->posts;
+		if ( $q['cache_results'] && $id_query_is_cacheable && ! $cache_found ) {
+			$post_ids = wp_list_pluck( $this->posts, 'ID' );
+			$cache_value = array(
+				'posts'         => $post_ids,
+				'found_posts'   => $this->found_posts,
+				'max_num_pages' => $this->max_num_pages,
+			);
+			wp_cache_set( $cache_key, $cache_value, 'post-queries' );
+		}
 		if ( ! $q['suppress_filters'] ) {
 			/**
 			 * Filters the raw post results array, prior to status checks.
 			 *
 			 * @since 2.3.0
 			/** This filter is documented in wp-includes/query.php */
 			$climits = apply_filters_ref_array( 'comment_feed_limits', array( 'LIMIT ' . get_option( 'posts_per_rss' ), &$this ) );
 			$comments_request = "SELECT {$wpdb->comments}.comment_ID FROM {$wpdb->comments} $cjoin $cwhere $cgroupby $corderby $climits";
-			$key          = md5( $comments_request );
+			$comment_key          = md5( $comments_request );
-			$last_changed = wp_cache_get_last_changed( 'comment' );
+			$comment_last_changed = wp_cache_get_last_changed( 'comment' );
-			$cache_key   = "comment_feed:$key:$last_changed";
+			$comment_cache_key = "comment_feed:$comment_key:$comment_last_changed";
-			$comment_ids = wp_cache_get( $cache_key, 'comment' );
+			$comment_ids       = wp_cache_get( $comment_cache_key, 'comment-queries' );
 			if ( false === $comment_ids ) {
 				$comment_ids = $wpdb->get_col( $comments_request );
-				wp_cache_add( $cache_key, $comment_ids, 'comment' );
+				wp_cache_add( $comment_cache_key, $comment_ids, 'comment-queries' );
 			}
-			_prime_comment_caches( $comment_ids, false );
+			_prime_comment_caches( $comment_ids );
 			// Convert to WP_Comment.
 			/** @var WP_Comment[] */
 			$this->comments      = array_map( 'get_comment', $comment_ids );
 			$this->comment_count = count( $this->comments );
 					// Remove sticky from current position.
 					array_splice( $this->posts, $i, 1 );
 					// Move to front, after other stickies.
 					array_splice( $this->posts, $sticky_offset, 0, array( $sticky_post ) );
 					// Increment the sticky offset. The next sticky will be placed at this offset.
-					$sticky_offset++;
+					++$sticky_offset;
 					// Remove post from sticky posts array.
 					$offset = array_search( $sticky_post->ID, $sticky_posts, true );
 					unset( $sticky_posts[ $offset ] );
 				}
 			}
 					)
 				);
 				foreach ( $stickies as $sticky_post ) {
 					array_splice( $this->posts, $sticky_offset, 0, array( $sticky_post ) );
-					$sticky_offset++;
+					++$sticky_offset;
 				}
 			}
-		}
-		// If comments have been fetched as part of the query, make sure comment meta lazy-loading is set up.
-		if ( ! empty( $this->comments ) ) {
-			wp_queue_comments_for_comment_meta_lazyload( $this->comments );
 		}
 		if ( ! $q['suppress_filters'] ) {
 			/**
 			 * Filters the array of retrieved posts after they've been fetched and
 			 * @param WP_Query  $query The WP_Query instance (passed by reference).
 			 */
 			$this->posts = apply_filters_ref_array( 'the_posts', array( $this->posts, &$this ) );
 		}
-		// Ensure that any posts added/modified via one of the filters above are
+		/*
-		// of the type WP_Post and are filtered.
+		 * Ensure that any posts added/modified via one of the filters above are
+		 * of the type WP_Post and are filtered.
+		 */
 		if ( $this->posts ) {
 			$this->post_count = count( $this->posts );
 			/** @var WP_Post[] */
 			$this->posts = array_map( 'get_post', $this->posts );
 			if ( $q['cache_results'] ) {
-				update_post_caches( $this->posts, $post_type, $q['update_post_term_cache'], $q['update_post_meta_cache'] );
+				if ( $is_unfiltered_query && $unfiltered_posts === $this->posts ) {
+					update_post_caches( $this->posts, $post_type, $q['update_post_term_cache'], $q['update_post_meta_cache'] );
+				} else {
+					$post_ids = wp_list_pluck( $this->posts, 'ID' );
+					_prime_post_caches( $post_ids, $q['update_post_term_cache'], $q['update_post_meta_cache'] );
+				}
 			}
 			/** @var WP_Post */
 			$this->post = reset( $this->posts );
 		} else {
 			$this->post_count = 0;
 			$this->posts      = array();
 		}
+		if ( ! empty( $this->posts ) && $q['update_menu_item_cache'] ) {
+			update_menu_item_cache( $this->posts );
+		}
 		if ( $q['lazy_load_term_meta'] ) {
 			wp_queue_posts_for_term_meta_lazyload( $this->posts );
 		}
 		return $this->posts;
 	}
 	/**
-	 * Set up the amount of found posts and the number of pages (if limit clause was used)
+	 * Sets up the amount of found posts and the number of pages (if limit clause was used)
 	 * for the current query.
 	 *
 	 * @since 3.5.0
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 * @param string $limits LIMIT clauses of the query.
 	 */
 	private function set_found_posts( $q, $limits ) {
 		global $wpdb;
-		// Bail if posts is an empty array. Continue if posts is an empty string,
+		/*
-		// null, or false to accommodate caching plugins that fill posts later.
+		 * Bail if posts is an empty array. Continue if posts is an empty string,
+		 * null, or false to accommodate caching plugins that fill posts later.
+		 */
 		if ( $q['no_found_rows'] || ( is_array( $this->posts ) && ! $this->posts ) ) {
 			return;
 		}
 		if ( ! empty( $limits ) ) {
 		 * @param WP_Query $query       The WP_Query instance (passed by reference).
 		 */
 		$this->found_posts = (int) apply_filters_ref_array( 'found_posts', array( $this->found_posts, &$this ) );
 		if ( ! empty( $limits ) ) {
-			$this->max_num_pages = ceil( $this->found_posts / $q['posts_per_page'] );
+			$this->max_num_pages = (int) ceil( $this->found_posts / $q['posts_per_page'] );
 		}
 	}
 	/**
-	 * Set up the next post and iterate current post index.
+	 * Sets up the next post and iterate current post index.
 	 *
 	 * @since 1.5.0
 	 *
 	 * @return WP_Post Next post.
 	 */
 	public function next_post() {
-		$this->current_post++;
+		++$this->current_post;
 		/** @var WP_Post */
 		$this->post = $this->posts[ $this->current_post ];
 		return $this->post;
 	}
 	 *
 	 * @global WP_Post $post Global post object.
 	 */
 	public function the_post() {
 		global $post;
+		if ( ! $this->in_the_loop ) {
+			// Only prime the post cache for queries limited to the ID field.
+			$post_ids = array_filter( $this->posts, 'is_numeric' );
+			// Exclude any falsey values, such as 0.
+			$post_ids = array_filter( $post_ids );
+			if ( $post_ids ) {
+				_prime_post_caches( $post_ids, $this->query_vars['update_post_term_cache'], $this->query_vars['update_post_meta_cache'] );
+			}
+			$post_objects = array_map( 'get_post', $this->posts );
+			update_post_author_caches( $post_objects );
+		}
 		$this->in_the_loop = true;
+		$this->before_loop = false;
 		if ( -1 == $this->current_post ) { // Loop has just started.
 			/**
 			 * Fires once the loop is started.
 			 *
 			 */
 			do_action_ref_array( 'loop_end', array( &$this ) );
 			// Do some cleaning up after the loop.
 			$this->rewind_posts();
 		} elseif ( 0 === $this->post_count ) {
+			$this->before_loop = false;
 			/**
 			 * Fires if no results are found in a post query.
 			 *
 			 * @since 4.9.0
 			 *
 		$this->in_the_loop = false;
 		return false;
 	}
 	/**
-	 * Rewind the posts and reset post index.
+	 * Rewinds the posts and resets post index.
 	 *
 	 * @since 1.5.0
 	 */
 	public function rewind_posts() {
 		$this->current_post = -1;
 			$this->post = $this->posts[0];
 		}
 	}
 	/**
-	 * Iterate current comment index and return WP_Comment object.
+	 * Iterates current comment index and returns WP_Comment object.
 	 *
 	 * @since 2.2.0
 	 *
 	 * @return WP_Comment Comment object.
 	 */
 	public function next_comment() {
-		$this->current_comment++;
+		++$this->current_comment;
 		/** @var WP_Comment */
 		$this->comment = $this->comments[ $this->current_comment ];
 		return $this->comment;
 	}
 			do_action( 'comment_loop_start' );
 		}
 	}
 	/**
-	 * Whether there are more comments available.
+	 * Determines whether there are more comments available.
 	 *
 	 * Automatically rewinds comments when finished.
 	 *
 	 * @since 2.2.0
 	 *
 		return false;
 	}
 	/**
-	 * Rewind the comments, resets the comment index and comment to first.
+	 * Rewinds the comments, resets the comment index and comment to first.
 	 *
 	 * @since 2.2.0
 	 */
 	public function rewind_comments() {
 		$this->current_comment = -1;
 			$this->query( $query );
 		}
 	}
 	/**
-	 * Make private properties readable for backward compatibility.
+	 * Makes private properties readable for backward compatibility.
 	 *
 	 * @since 4.0.0
 	 *
 	 * @param string $name Property to get.
 	 * @return mixed Property.
 			return $this->$name;
 		}
 	}
 	/**
-	 * Make private properties checkable for backward compatibility.
+	 * Makes private properties checkable for backward compatibility.
 	 *
 	 * @since 4.0.0
 	 *
 	 * @param string $name Property to check if set.
 	 * @return bool Whether the property is set.
 			return isset( $this->$name );
 		}
 	}
 	/**
-	 * Make private/protected methods readable for backward compatibility.
+	 * Makes private/protected methods readable for backward compatibility.
 	 *
 	 * @since 4.0.0
 	 *
 	 * @param string $name      Method to call.
 	 * @param array  $arguments Arguments to pass when calling.
 		}
 		return false;
 	}
 	/**
-	 * Is the query for an existing archive page?
+	 * Determines whether the query is for an existing archive page.
 	 *
 	 * Archive pages include category, tag, author, date, custom post type,
 	 * and custom taxonomy based archives.
 	 *
 	 * @since 3.1.0
 	public function is_archive() {
 		return (bool) $this->is_archive;
 	}
 	/**
-	 * Is the query for an existing post type archive page?
+	 * Determines whether the query is for an existing post type archive page.
 	 *
 	 * @since 3.1.0
 	 *
 	 * @param string|string[] $post_types Optional. Post type or array of posts types
 	 *                                    to check against. Default empty.
 		if ( is_array( $post_type ) ) {
 			$post_type = reset( $post_type );
 		}
 		$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 );
 	}
 	/**
-	 * Is the query for an existing attachment page?
+	 * Determines whether the query is for an existing attachment page.
 	 *
 	 * @since 3.1.0
 	 *
 	 * @param int|string|int[]|string[] $attachment Optional. Attachment ID, title, slug, or array of such
 	 *                                              to check against. Default empty.
 		}
 		$attachment = array_map( 'strval', (array) $attachment );
 		$post_obj = $this->get_queried_object();
+		if ( ! $post_obj ) {
+			return false;
+		}
 		if ( in_array( (string) $post_obj->ID, $attachment, true ) ) {
 			return true;
 		} elseif ( in_array( $post_obj->post_title, $attachment, true ) ) {
 			return true;
 		}
 		return false;
 	}
 	/**
-	 * Is the query for an existing author archive page?
+	 * Determines whether the query is for an existing author archive page.
 	 *
 	 * If the $author parameter is specified, this function will additionally
 	 * check if the query is for one of the authors specified.
 	 *
 	 * @since 3.1.0
 		if ( empty( $author ) ) {
 			return true;
 		}
 		$author_obj = $this->get_queried_object();
+		if ( ! $author_obj ) {
+			return false;
+		}
 		$author = array_map( 'strval', (array) $author );
 		if ( in_array( (string) $author_obj->ID, $author, true ) ) {
 			return true;
 		return false;
 	}
 	/**
-	 * Is the query for an existing category archive page?
+	 * Determines whether the query is for an existing category archive page.
 	 *
 	 * If the $category parameter is specified, this function will additionally
 	 * check if the query is for one of the categories specified.
 	 *
 	 * @since 3.1.0
 		if ( empty( $category ) ) {
 			return true;
 		}
 		$cat_obj = $this->get_queried_object();
+		if ( ! $cat_obj ) {
+			return false;
+		}
 		$category = array_map( 'strval', (array) $category );
 		if ( in_array( (string) $cat_obj->term_id, $category, true ) ) {
 			return true;
 		return false;
 	}
 	/**
-	 * Is the query for an existing tag archive page?
+	 * Determines whether the query is for an existing tag archive page.
 	 *
 	 * If the $tag parameter is specified, this function will additionally
 	 * check if the query is for one of the tags specified.
 	 *
 	 * @since 3.1.0
 		if ( empty( $tag ) ) {
 			return true;
 		}
 		$tag_obj = $this->get_queried_object();
+		if ( ! $tag_obj ) {
+			return false;
+		}
 		$tag = array_map( 'strval', (array) $tag );
 		if ( in_array( (string) $tag_obj->term_id, $tag, true ) ) {
 			return true;
 		return false;
 	}
 	/**
-	 * Is the query for an existing custom taxonomy archive page?
+	 * Determines whether the query is for an existing custom taxonomy archive page.
 	 *
 	 * If the $taxonomy parameter is specified, this function will additionally
 	 * check if the query is for that specific $taxonomy.
 	 *
 	 * If the $term parameter is specified in addition to the $taxonomy parameter,
 				)
 			);
 	}
 	/**
-	 * Whether the current URL is within the comments popup window.
+	 * Determines whether the current URL is within the comments popup window.
 	 *
 	 * @since 3.1.0
 	 * @deprecated 4.5.0
 	 *
 	 * @return false Always returns false.
 		return false;
 	}
 	/**
-	 * Is the query for an existing date archive?
+	 * Determines whether the query is for an existing date archive.
 	 *
 	 * @since 3.1.0
 	 *
 	 * @return bool Whether the query is for an existing date archive.
 	 */
 	public function is_date() {
 		return (bool) $this->is_date;
 	}
 	/**
-	 * Is the query for an existing day archive?
+	 * Determines whether the query is for an existing day archive.
 	 *
 	 * @since 3.1.0
 	 *
 	 * @return bool Whether the query is for an existing day archive.
 	 */
 	public function is_day() {
 		return (bool) $this->is_day;
 	}
 	/**
-	 * Is the query for a feed?
+	 * Determines whether the query is for a feed.
 	 *
 	 * @since 3.1.0
 	 *
 	 * @param string|string[] $feeds Optional. Feed type or array of feed types
 	 *                                         to check against. Default empty.
 		return in_array( $qv, (array) $feeds, true );
 	}
 	/**
-	 * Is the query for a comments feed?
+	 * Determines whether the query is for a comments feed.
 	 *
 	 * @since 3.1.0
 	 *
 	 * @return bool Whether the query is for a comments feed.
 	 */
 	public function is_comment_feed() {
 		return (bool) $this->is_comment_feed;
 	}
 	/**
-	 * Is the query for the front page of the site?
+	 * Determines whether the query is for the front page of the site.
 	 *
 	 * This is for what is displayed at your site's main URL.
 	 *
 	 * Depends on the site's "Front page displays" Reading Settings 'show_on_front' and 'page_on_front'.
 	 *
 	 * If you set a static page for the front page of your site, this function will return
 	 * true when viewing that page.
 	 *
-	 * Otherwise the same as @see WP_Query::is_home()
+	 * Otherwise the same as {@see WP_Query::is_home()}.
 	 *
 	 * @since 3.1.0
 	 *
 	 * @return bool Whether the query is for the front page of the site.
 	 */
 			return false;
 		}
 	}
 	/**
-	 * Is the query for the blog homepage?
+	 * Determines whether the query is for the blog homepage.
 	 *
 	 * This is the page which shows the time based blog content of your site.
 	 *
 	 * Depends on the site's "Front page displays" Reading Settings 'show_on_front' and 'page_for_posts'.
 	 *
 	public function is_home() {
 		return (bool) $this->is_home;
 	}
 	/**
-	 * Is the query for the Privacy Policy page?
+	 * Determines whether the query is for the Privacy Policy page.
 	 *
 	 * This is the page which shows the Privacy Policy content of your site.
 	 *
 	 * Depends on the site's "Change your Privacy Policy page" Privacy Settings 'wp_page_for_privacy_policy'.
 	 *
 			return false;
 		}
 	}
 	/**
-	 * Is the query for an existing month archive?
+	 * Determines whether the query is for an existing month archive.
 	 *
 	 * @since 3.1.0
 	 *
 	 * @return bool Whether the query is for an existing month archive.
 	 */
 	public function is_month() {
 		return (bool) $this->is_month;
 	}
 	/**
-	 * Is the query for an existing single page?
+	 * Determines whether the query is for an existing single page.
 	 *
 	 * If the $page parameter is specified, this function will additionally
 	 * check if the query is for one of the pages specified.
 	 *
 	 * @since 3.1.0
 		if ( empty( $page ) ) {
 			return true;
 		}
 		$page_obj = $this->get_queried_object();
+		if ( ! $page_obj ) {
+			return false;
+		}
 		$page = array_map( 'strval', (array) $page );
 		if ( in_array( (string) $page_obj->ID, $page, true ) ) {
 			return true;
 		return false;
 	}
 	/**
-	 * Is the query for a paged result and not for the first page?
+	 * Determines whether the query is for a paged result and not for the first page.
 	 *
 	 * @since 3.1.0
 	 *
 	 * @return bool Whether the query is for a paged result.
 	 */
 	public function is_paged() {
 		return (bool) $this->is_paged;
 	}
 	/**
-	 * Is the query for a post or page preview?
+	 * Determines whether the query is for a post or page preview.
 	 *
 	 * @since 3.1.0
 	 *
 	 * @return bool Whether the query is for a post or page preview.
 	 */
 	public function is_preview() {
 		return (bool) $this->is_preview;
 	}
 	/**
-	 * Is the query for the robots.txt file?
+	 * Determines whether the query is for the robots.txt file.
 	 *
 	 * @since 3.1.0
 	 *
 	 * @return bool Whether the query is for the robots.txt file.
 	 */
 	public function is_robots() {
 		return (bool) $this->is_robots;
 	}
 	/**
-	 * Is the query for the favicon.ico file?
+	 * Determines whether the query is for the favicon.ico file.
 	 *
 	 * @since 5.4.0
 	 *
 	 * @return bool Whether the query is for the favicon.ico file.
 	 */
 	public function is_favicon() {
 		return (bool) $this->is_favicon;
 	}
 	/**
-	 * Is the query for a search?
+	 * Determines whether the query is for a search.
 	 *
 	 * @since 3.1.0
 	 *
 	 * @return bool Whether the query is for a search.
 	 */
 	public function is_search() {
 		return (bool) $this->is_search;
 	}
 	/**
-	 * Is the query for an existing single post?
+	 * Determines whether the query is for an existing single post.
 	 *
 	 * Works for any post type excluding pages.
 	 *
 	 * If the $post parameter is specified, this function will additionally
 	 * check if the query is for one of the Posts specified.
 		if ( empty( $post ) ) {
 			return true;
 		}
 		$post_obj = $this->get_queried_object();
+		if ( ! $post_obj ) {
+			return false;
+		}
 		$post = array_map( 'strval', (array) $post );
 		if ( in_array( (string) $post_obj->ID, $post, true ) ) {
 			return true;
 		}
 		return false;
 	}
 	/**
-	 * Is the query for an existing single post of any post type (post, attachment, page,
+	 * Determines whether the query is for an existing single post of any post type
-	 * custom post types)?
+	 * (post, attachment, page, custom post types).
 	 *
 	 * If the $post_types parameter is specified, this function will additionally
 	 * check if the query is for one of the Posts Types specified.
 	 *
 	 * @since 3.1.0
 		if ( empty( $post_types ) || ! $this->is_singular ) {
 			return (bool) $this->is_singular;
 		}
 		$post_obj = $this->get_queried_object();
+		if ( ! $post_obj ) {
+			return false;
+		}
 		return in_array( $post_obj->post_type, (array) $post_types, true );
 	}
 	/**
-	 * Is the query for a specific time?
+	 * Determines whether the query is for a specific time.
 	 *
 	 * @since 3.1.0
 	 *
 	 * @return bool Whether the query is for a specific time.
 	 */
 	public function is_time() {
 		return (bool) $this->is_time;
 	}
 	/**
-	 * Is the query for a trackback endpoint call?
+	 * Determines whether the query is for a trackback endpoint call.
 	 *
 	 * @since 3.1.0
 	 *
 	 * @return bool Whether the query is for a trackback endpoint call.
 	 */
 	public function is_trackback() {
 		return (bool) $this->is_trackback;
 	}
 	/**
-	 * Is the query for an existing year archive?
+	 * Determines whether the query is for an existing year archive.
 	 *
 	 * @since 3.1.0
 	 *
 	 * @return bool Whether the query is for an existing year archive.
 	 */
 	public function is_year() {
 		return (bool) $this->is_year;
 	}
 	/**
-	 * Is the query a 404 (returns no results)?
+	 * Determines whether the query is a 404 (returns no results).
 	 *
 	 * @since 3.1.0
 	 *
 	 * @return bool Whether the query is a 404 error.
 	 */
 	public function is_404() {
 		return (bool) $this->is_404;
 	}
 	/**
-	 * Is the query for an embedded post?
+	 * Determines whether the query is for an embedded post.
 	 *
 	 * @since 4.4.0
 	 *
 	 * @return bool Whether the query is for an embedded post.
 	 */
 	public function is_embed() {
 		return (bool) $this->is_embed;
 	}
 	/**
-	 * Is the query the main query?
+	 * Determines whether the query is the main query.
 	 *
 	 * @since 3.3.0
 	 *
-	 * @global WP_Query $wp_query WordPress Query object.
+	 * @global WP_Query $wp_the_query WordPress Query object.
 	 *
 	 * @return bool Whether the query is the main query.
 	 */
 	public function is_main_query() {
 		global $wp_the_query;
 		return $wp_the_query === $this;
 	}
 	/**
-	 * Set up global post data.
+	 * Sets up global post data.
 	 *
 	 * @since 4.1.0
 	 * @since 4.4.0 Added the ability to pass a post ID to `$post`.
 	 *
 	 * @global int     $id
 		return true;
 	}
 	/**
-	 * Generate post data.
+	 * Generates post data.
 	 *
 	 * @since 5.2.0
 	 *
 	 * @param WP_Post|object|int $post WP_Post instance or Post ID/object.
 	 * @return array|false Elements of post or false on failure.
 		$id = (int) $post->ID;
 		$authordata = get_userdata( $post->post_author );
-		$currentday   = mysql2date( 'd.m.y', $post->post_date, false );
+		$currentday   = false;
-		$currentmonth = mysql2date( 'm', $post->post_date, false );
+		$currentmonth = false;
-		$numpages     = 1;
-		$multipage    = 0;
+		$post_date = $post->post_date;
-		$page         = $this->get( 'page' );
+		if ( ! empty( $post_date ) && '0000-00-00 00:00:00' !== $post_date ) {
+			// Avoid using mysql2date for performance reasons.
+			$currentmonth = substr( $post_date, 5, 2 );
+			$day          = substr( $post_date, 8, 2 );
+			$year         = substr( $post_date, 2, 2 );
+			$currentday = sprintf( '%s.%s.%s', $day, $currentmonth, $year );
+		}
+		$numpages  = 1;
+		$multipage = 0;
+		$page      = $this->get( 'page' );
 		if ( ! $page ) {
 			$page = 1;
 		}
 		/*
 		} else {
 			$more = 0;
 		}
 		$content = $post->post_content;
-		if ( false !== strpos( $content, '<!--nextpage-->' ) ) {
+		if ( str_contains( $content, '<!--nextpage-->' ) ) {
 			$content = str_replace( "\n<!--nextpage-->\n", '<!--nextpage-->', $content );
 			$content = str_replace( "\n<!--nextpage-->", '<!--nextpage-->', $content );
 			$content = str_replace( "<!--nextpage-->\n", '<!--nextpage-->', $content );
 			// Remove the nextpage block delimiters, to avoid invalid block structures in the split content.
 			$content = str_replace( '<!-- wp:nextpage -->', '', $content );
 			$content = str_replace( '<!-- /wp:nextpage -->', '', $content );
 			// Ignore nextpage at the beginning of the content.
-			if ( 0 === strpos( $content, '<!--nextpage-->' ) ) {
+			if ( str_starts_with( $content, '<!--nextpage-->' ) ) {
 				$content = substr( $content, 15 );
 			}
 			$pages = explode( '<!--nextpage-->', $content );
 		} else {
 		$elements = compact( 'id', 'authordata', 'currentday', 'currentmonth', 'page', 'pages', 'multipage', 'more', 'numpages' );
 		return $elements;
 	}
+	/**
+	 * Generates cache key.
+	 *
+	 * @since 6.1.0
+	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
+	 * @param array  $args Query arguments.
+	 * @param string $sql  SQL statement.
+	 * @return string Cache key.
+	 */
+	protected function generate_cache_key( array $args, $sql ) {
+		global $wpdb;
+		unset(
+			$args['cache_results'],
+			$args['fields'],
+			$args['lazy_load_term_meta'],
+			$args['update_post_meta_cache'],
+			$args['update_post_term_cache'],
+			$args['update_menu_item_cache'],
+			$args['suppress_filters']
+		);
+		if ( empty( $args['post_type'] ) ) {
+			if ( $this->is_attachment ) {
+				$args['post_type'] = 'attachment';
+			} elseif ( $this->is_page ) {
+				$args['post_type'] = 'page';
+			} else {
+				$args['post_type'] = 'post';
+			}
+		} elseif ( 'any' === $args['post_type'] ) {
+			$args['post_type'] = array_values( get_post_types( array( 'exclude_from_search' => false ) ) );
+		}
+		$args['post_type'] = (array) $args['post_type'];
+		// Sort post types to ensure same cache key generation.
+		sort( $args['post_type'] );
+		if ( isset( $args['post_status'] ) ) {
+			$args['post_status'] = (array) $args['post_status'];
+			// Sort post status to ensure same cache key generation.
+			sort( $args['post_status'] );
+		}
+		// Add a default orderby value of date to ensure same cache key generation.
+		if ( ! isset( $q['orderby'] ) ) {
+			$args['orderby'] = 'date';
+		}
+		$placeholder = $wpdb->placeholder_escape();
+		array_walk_recursive(
+			$args,
+			/*
+			 * Replace wpdb placeholders with the string used in the database
+			 * query to avoid unreachable cache keys. This is necessary because
+			 * the placeholder is randomly generated in each request.
+			 *
+			 * $value is passed by reference to allow it to be modified.
+			 * array_walk_recursive() does not return an array.
+			 */
+			static function ( &$value ) use ( $wpdb, $placeholder ) {
+				if ( is_string( $value ) && str_contains( $value, $placeholder ) ) {
+					$value = $wpdb->remove_placeholder_escape( $value );
+				}
+			}
+		);
+		ksort( $args );
+		// Replace wpdb placeholder in the SQL statement used by the cache key.
+		$sql = $wpdb->remove_placeholder_escape( $sql );
+		$key = md5( serialize( $args ) . $sql );
+		$last_changed = wp_cache_get_last_changed( 'posts' );
+		if ( ! empty( $this->tax_query->queries ) ) {
+			$last_changed .= wp_cache_get_last_changed( 'terms' );
+		}
+		return "wp_query:$key:$last_changed";
+	}
 	/**
 	 * After looping through a nested query, this function
 	 * restores the $post global to the current post in this query.
 	 *
 	 * @since 3.7.0
 			$this->setup_postdata( $this->post );
 		}
 	}
 	/**
-	 * Lazyload term meta for posts in the loop.
+	 * Lazyloads term meta for posts in the loop.
 	 *
 	 * @since 4.4.0
 	 * @deprecated 4.5.0 See wp_queue_posts_for_term_meta_lazyload().
 	 *
 	 * @param mixed $check
 		_deprecated_function( __METHOD__, '4.5.0' );
 		return $check;
 	}
 	/**
-	 * Lazyload comment meta for comments in the loop.
+	 * Lazyloads comment meta for comments in the loop.
 	 *
 	 * @since 4.4.0
-	 * @deprecated 4.5.0 See wp_queue_comments_for_comment_meta_lazyload().
+	 * @deprecated 4.5.0 See wp_lazyload_comment_meta().
 	 *
 	 * @param mixed $check
 	 * @param int   $comment_id
 	 * @return mixed
 	 */

changeset 21	48c4eec2b7e6
parent 19	3d72ae0968f4
child 22	8c2e4d02f4ef