Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 06:42:56 +02:00
Code Issues Projects Releases Wiki Activity

Editor: Ensure WP_Query and WP_Term_Query results are referenced properly when creating dynamic template names for use in the site editor.

Browse Source 
[54445] updated the new dynamic template name functions used by the site editor in 6.1 to use `WP_Query` and `WP_Term_Query` instances in place of `get_posts` and `get_terms` respectively.  However, the latter functions return an array of results whereas `WP_Query` instances store their found results in a class property.  This change updates the code to reference either `$posts_query->posts` or `$terms_query->terms` where necessary.

Follow-up to [54280], [54333], [54370], [54388], and [54445].

Props bernhard-reiter, spacedmonkey, davidbaumwald.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54494


git-svn-id: http://core.svn.wordpress.org/trunk@54053 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
davidbaumwald 2022-10-11 17:30:12 +00:00
parent 701b803ffe
commit 48ac09448b
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
wp-includes/block-template-utils.php
View File

@ -560,9 +560,9 @@ function _wp_build_title_and_description_for_single_post_type_block_template( $p
'name' => $slug,
);
$args = wp_parse_args( $args, $default_args );
$posts = new WP_Query( $args );
$posts_query = new WP_Query( $args );
if ( empty( $posts ) ) {
if ( empty( $posts_query->posts ) ) {
$template->title = sprintf(
/* translators: Custom template title in the Site Editor referencing a post that was not found. 1: Post type singular name, 2: Post type slug. */
__( 'Not found: %1$s (%2$s)' ),
@ -573,7 +573,7 @@ function _wp_build_title_and_description_for_single_post_type_block_template( $p
return false;
}
$post_title = $posts[0]->post_title;
$post_title = $posts_query->posts[0]->post_title;
$template->title = sprintf(
/* translators: Custom template title in the Site Editor. 1: Post type singular name, 2: Post title. */
@ -591,11 +591,10 @@ function _wp_build_title_and_description_for_single_post_type_block_template( $p
$args = array(
'title' => $post_title,
);
$args = wp_parse_args( $args, $default_args );
$args = wp_parse_args( $args, $default_args );
$posts_with_same_title_query = new WP_Query( $args );
$posts_with_same_title = new WP_Query( $args );
if ( count( $posts_with_same_title ) > 1 ) {
if ( count( $posts_with_same_title_query->posts ) > 1 ) {
$template->title = sprintf(
/* translators: Custom template title in the Site Editor. 1: Template title, 2: Post type slug. */
__( '%1$s (%2$s)' ),
@ -635,10 +634,10 @@ function _wp_build_title_and_description_for_taxonomy_block_template( $taxonomy,
'number' => 1,
'slug' => $slug,
);
$args = wp_parse_args( $args, $default_args );
$terms = $term_query->query( $args );
$args = wp_parse_args( $args, $default_args );
$terms_query = $term_query->query( $args );
if ( empty( $terms ) ) {
if ( empty( $terms_query->terms ) ) {
$template->title = sprintf(
/* translators: Custom template title in the Site Editor, referencing a taxonomy term that was not found. 1: Taxonomy singular name, 2: Term slug. */
__( 'Not found: %1$s (%2$s)' ),
@ -648,7 +647,7 @@ function _wp_build_title_and_description_for_taxonomy_block_template( $taxonomy,
return false;
}
$term_title = $terms[0]->name;
$term_title = $terms_query->terms[0]->name;
$template->title = sprintf(
/* translators: Custom template title in the Site Editor. 1: Taxonomy singular name, 2: Term title. */
@ -669,11 +668,10 @@ function _wp_build_title_and_description_for_taxonomy_block_template( $taxonomy,
'number' => 2,
'name' => $term_title,
);
$args = wp_parse_args( $args, $default_args );
$args = wp_parse_args( $args, $default_args );
$terms_with_same_title_query = $term_query->query( $args );
$terms_with_same_title = $term_query->query( $args );
if ( count( $terms_with_same_title ) > 1 ) {
if ( count( $terms_with_same_title_query->terms ) > 1 ) {
$template->title = sprintf(
/* translators: Custom template title in the Site Editor. 1: Template title, 2: Term slug. */
__( '%1$s (%2$s)' ),

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
$wp_version = '6.1-beta3-54493';
$wp_version = '6.1-beta3-54494';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.