<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[54494] trunk/src/wp-includes/block-template-utils.php: Editor: Ensure `WP_Query` and `WP_Term_Query` results are referenced properly when creating dynamic template names for use in the site editor.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/54494">54494</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/54494","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>davidbaumwald</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-10-11 17:28:54 +0000 (Tue, 11 Oct 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Editor: Ensure `WP_Query` and `WP_Term_Query` results are referenced properly when creating dynamic template names for use in the site editor.
<a href="https://core.trac.wordpress.org/changeset/54445">[54445]</a> 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 <a href="https://core.trac.wordpress.org/changeset/54280">[54280]</a>, <a href="https://core.trac.wordpress.org/changeset/54333">[54333]</a>, <a href="https://core.trac.wordpress.org/changeset/54370">[54370]</a>, <a href="https://core.trac.wordpress.org/changeset/54388">[54388]</a>, and <a href="https://core.trac.wordpress.org/changeset/54445">[54445]</a>.
Props bernhard-reiter, spacedmonkey, davidbaumwald.
See <a href="https://core.trac.wordpress.org/ticket/56467">#56467</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblocktemplateutilsphp">trunk/src/wp-includes/block-template-utils.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesblocktemplateutilsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/block-template-utils.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/block-template-utils.php 2022-10-11 17:15:11 UTC (rev 54493)
+++ trunk/src/wp-includes/block-template-utils.php 2022-10-11 17:28:54 UTC (rev 54494)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -560,9 +560,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => $slug,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args( $args, $default_args );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = new WP_Query( $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts_query = new WP_Query( $args );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $posts ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $posts_query->posts ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $template->title = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Custom template title in the Site Editor referencing a post that was not found. 1: Post type singular name, 2: Post type slug. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Not found: %1$s (%2$s)' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -573,7 +573,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_title = $posts[0]->post_title;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_title = $posts_query->posts[0]->post_title;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $template->title = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Custom template title in the Site Editor. 1: Post type singular name, 2: Post title. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -591,11 +591,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => $post_title,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args = wp_parse_args( $args, $default_args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args = wp_parse_args( $args, $default_args );
+ $posts_with_same_title_query = new WP_Query( $args );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts_with_same_title = new WP_Query( $args );
-
- if ( count( $posts_with_same_title ) > 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( count( $posts_with_same_title_query->posts ) > 1 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $template->title = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Custom template title in the Site Editor. 1: Template title, 2: Post type slug. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( '%1$s (%2$s)' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -635,10 +634,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'number' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => $slug,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args = wp_parse_args( $args, $default_args );
- $terms = $term_query->query( $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args = wp_parse_args( $args, $default_args );
+ $terms_query = $term_query->query( $args );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $terms ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $terms_query->terms ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $template->title = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Custom template title in the Site Editor, referencing a taxonomy term that was not found. 1: Taxonomy singular name, 2: Term slug. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Not found: %1$s (%2$s)' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -648,7 +647,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_title = $terms[0]->name;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_title = $terms_query->terms[0]->name;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $template->title = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Custom template title in the Site Editor. 1: Taxonomy singular name, 2: Term title. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -669,11 +668,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'number' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => $term_title,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args = wp_parse_args( $args, $default_args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args = wp_parse_args( $args, $default_args );
+ $terms_with_same_title_query = $term_query->query( $args );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms_with_same_title = $term_query->query( $args );
-
- if ( count( $terms_with_same_title ) > 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( count( $terms_with_same_title_query->terms ) > 1 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $template->title = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Custom template title in the Site Editor. 1: Template title, 2: Term slug. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( '%1$s (%2$s)' ),
</span></span></pre>
</div>
</div>
</body>
</html>