<!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>[58323] trunk: Editor: Fix block template files query for a post-type.</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/58323">58323</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/58323","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ellatrix</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-06-04 08:13:01 +0000 (Tue, 04 Jun 2024)</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: Fix block template files query for a post-type.
See https://github.com/WordPress/gutenberg/pull/61244.
See https://github.com/WordPress/wordpress-develop/pull/6468.
Fixes <a href="https://core.trac.wordpress.org/ticket/61110">#61110</a>.
Props mamaduka, mukesh27, grantmkin, vcanales, ellatrix, oandregal.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblocktemplateutilsphp">trunk/src/wp-includes/block-template-utils.php</a></li>
<li><a href="#trunktestsphpunittestsblocktemplatephp">trunk/tests/phpunit/tests/block-template.php</a></li>
<li><a href="#trunktestsphpunittestsblocksgetBlockTemplatesphp">trunk/tests/phpunit/tests/blocks/getBlockTemplates.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 2024-06-04 07:37:06 UTC (rev 58322)
+++ trunk/src/wp-includes/block-template-utils.php 2024-06-04 08:13:01 UTC (rev 58323)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -362,6 +362,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return null;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $default_template_types = array();
+ if ( 'wp_template' === $template_type ) {
+ $default_template_types = get_default_block_template_types();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Prepare metadata from $query.
</span><span class="cx" style="display: block; padding: 0 10px"> $slugs_to_include = isset( $query['slug__in'] ) ? $query['slug__in'] : array();
</span><span class="cx" style="display: block; padding: 0 10px"> $slugs_to_skip = isset( $query['slug__not_in'] ) ? $query['slug__not_in'] : array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -425,6 +430,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'wp_template' === $template_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $candidate = _add_block_template_info( $new_template_item );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_custom = ! isset( $default_template_types[ $candidate['slug'] ] );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> ! $post_type ||
</span><span class="cx" style="display: block; padding: 0 10px"> ( $post_type && isset( $candidate['postTypes'] ) && in_array( $post_type, $candidate['postTypes'], true ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -431,6 +438,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $template_files[ $template_slug ] = $candidate;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // The custom templates with no associated post types are available for all post types.
+ if ( $post_type && ! isset( $candidate['postTypes'] ) && $is_custom ) {
+ $template_files[ $template_slug ] = $candidate;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsblocktemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/block-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/block-template.php 2024-06-04 07:37:06 UTC (rev 58322)
+++ trunk/tests/phpunit/tests/block-template.php 2024-06-04 08:13:01 UTC (rev 58323)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -399,6 +399,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Templates in the current theme.
</span><span class="cx" style="display: block; padding: 0 10px"> $templates = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'parts/small-header.html',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'templates/custom-hero-template.html',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'templates/custom-single-post-template.html',
</span><span class="cx" style="display: block; padding: 0 10px"> 'templates/index.html',
</span><span class="cx" style="display: block; padding: 0 10px"> 'templates/page-home.html',
</span></span></pre></div>
<a id="trunktestsphpunittestsblocksgetBlockTemplatesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/blocks/getBlockTemplates.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/getBlockTemplates.php 2024-06-04 07:37:06 UTC (rev 58322)
+++ trunk/tests/phpunit/tests/blocks/getBlockTemplates.php 2024-06-04 08:13:01 UTC (rev 58323)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,6 +188,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_get_block_templates_should_respect_posttypes_property
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 55881
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 61110
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $post_type Post type for query.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $expected Expected template IDs.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,6 +205,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Data provider.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The `custom-hero-template` is intentionally omitted from the theme.json's `customTemplates`.
+ * See: https://core.trac.wordpress.org/ticket/61110.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function data_get_block_templates_should_respect_posttypes_property() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,6 +215,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'block-theme//custom-hero-template',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'block-theme//custom-single-post-template',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,6 +222,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'block-theme//custom-hero-template',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'block-theme//page-home',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span></span></pre>
</div>
</div>
</body>
</html>