From d9a79d339d1d97c47a58c146850d3ef0df9c3c13 Mon Sep 17 00:00:00 2001 From: Aaron Jorbin Date: Mon, 14 Jun 2021 20:38:38 +0000 Subject: [PATCH] Block Editor: Prevent duplicate queries When passing args to `WP_Query::__construct` method (in this case, but creating a `new WP_Query`, this one internally executes the `WP_Query::get_posts` method and stores the result in the `WP_Query::posts` property. When calling the `WP_Query::get_posts` again, the same SQL query gets executed, and the result is again stored in the `WP_Query::posts` property. This was introduced in [51003]. Props david.binda, jorbin. Fixes #53280. See #53176. git-svn-id: https://develop.svn.wordpress.org/trunk@51144 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/block-template-utils.php | 4 ++-- src/wp-includes/theme-templates.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wp-includes/block-template-utils.php b/src/wp-includes/block-template-utils.php index fa32393290..ecdd8ec8fd 100644 --- a/src/wp-includes/block-template-utils.php +++ b/src/wp-includes/block-template-utils.php @@ -88,7 +88,7 @@ function get_block_templates( $query = array(), $template_type = 'wp_template' ) $template_query = new WP_Query( $wp_query_args ); $query_result = array(); - foreach ( $template_query->get_posts() as $post ) { + foreach ( $template_query->posts as $post ) { $template = _build_template_result_from_post( $post ); if ( ! is_wp_error( $template ) ) { @@ -130,7 +130,7 @@ function get_block_template( $id, $template_type = 'wp_template' ) { ), ); $template_query = new WP_Query( $wp_query_args ); - $posts = $template_query->get_posts(); + $posts = $template_query->posts; if ( count( $posts ) > 0 ) { $template = _build_template_result_from_post( $posts[0] ); diff --git a/src/wp-includes/theme-templates.php b/src/wp-includes/theme-templates.php index 5cce35cd99..f5e03c5786 100644 --- a/src/wp-includes/theme-templates.php +++ b/src/wp-includes/theme-templates.php @@ -49,7 +49,7 @@ function wp_filter_wp_template_unique_post_slug( $override_slug, $slug, $post_ID ), ); $check_query = new WP_Query( $check_query_args ); - $posts = $check_query->get_posts(); + $posts = $check_query->posts; if ( count( $posts ) > 0 ) { $suffix = 2; @@ -59,7 +59,7 @@ function wp_filter_wp_template_unique_post_slug( $override_slug, $slug, $post_ID $query_args['post_name__in'] = array( $alt_post_name ); $query = new WP_Query( $query_args ); $suffix++; - } while ( count( $query->get_posts() ) > 0 ); + } while ( count( $query->posts ) > 0 ); $override_slug = $alt_post_name; }