Changeset 54494

Timestamp:

10/11/2022 05:28:54 PM (4 years ago)

Author:

davidbaumwald

Message:

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

[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.

File:

• trunk/src/wp-includes/block-template-utils.php (modified) (6 diffs)

trunk/src/wp-includes/block-template-utils.php

@@ -561 +561 @@
         );
         $args  = wp_parse_args( $args, $default_args );
-        $posts = new WP_Query( $args );
-
-        if ( empty( $posts ) ) {
+        $posts_query = new WP_Query( $args );
+
+        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. */
@@ -574 +574 @@
         }
 
-        $post_title = $posts[0]->post_title;
+        $post_title = $posts_query->posts[0]->post_title;
 
         $template->title = sprintf(
@@ -592 +592 @@
                 'title' => $post_title,
         );
-        $args = wp_parse_args( $args, $default_args );
-
-        $posts_with_same_title = new WP_Query( $args );
-
-        if ( count( $posts_with_same_title ) > 1 ) {
+        $args                        = wp_parse_args( $args, $default_args );
+        $posts_with_same_title_query = new WP_Query( $args );
+
+        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. */
@@ -636 +635 @@
                 'slug'   => $slug,
         );
-        $args  = wp_parse_args( $args, $default_args );
-        $terms = $term_query->query( $args );
-
-        if ( empty( $terms ) ) {
+        $args        = wp_parse_args( $args, $default_args );
+        $terms_query = $term_query->query( $args );
+
+        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. */
@@ -649 +648 @@
         }
 
-        $term_title = $terms[0]->name;
+        $term_title = $terms_query->terms[0]->name;
 
         $template->title = sprintf(
@@ -670 +669 @@
                 'name'   => $term_title,
         );
-        $args = wp_parse_args( $args, $default_args );
-
-        $terms_with_same_title = $term_query->query( $args );
-
-        if ( count( $terms_with_same_title ) > 1 ) {
+        $args                        = wp_parse_args( $args, $default_args );
+        $terms_with_same_title_query = $term_query->query( $args );
+
+        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. */