<!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>[56183] trunk/src/wp-includes/blocks.php: Editor: Ensure blocks registered within parent theme are available when child theme is activated.</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/56183">56183</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/56183","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>audrasjb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-07-10 06:34:37 +0000 (Mon, 10 Jul 2023)</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 blocks registered within parent theme are available when child theme is activated.
This changeset fixes both `register_block_script_handle()` and `register_block_style_handle()` functions, allowing for child themes to access and utilise
blocks defined in parent themes.
Previously these functions could not handle blocks registered in Parent themes. This changeset fixes the issue by determining whether the given asset path
belongs to either of the template or stylesheet directories (Parent and Child themes respectively) as opposed to just checking using
`get_theme_file_path('')`.
Props jacknotman, Levdbas, audrasjb, guillaumeturpin, leprincenoir, whaze, isabel_brison.
Fixes <a href="https://core.trac.wordpress.org/ticket/57566">#57566</a>.
--Cette ligne, et les suivantes ci-dessous, seront ignorees--
M trunk/src/wp-includes/blocks.php</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblocksphp">trunk/src/wp-includes/blocks.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesblocksphp"></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/blocks.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks.php 2023-07-09 22:24:16 UTC (rev 56182)
+++ trunk/src/wp-includes/blocks.php 2023-07-10 06:34:37 UTC (rev 56183)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,17 +134,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wpinc_path_norm = wp_normalize_path( realpath( ABSPATH . WPINC ) );
</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">- $theme_path_norm = wp_normalize_path( get_theme_file_path() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Cache $template_path_norm and $stylesheet_path_norm to avoid unnecessary additional calls.
+ static $template_path_norm = '';
+ static $stylesheet_path_norm = '';
+ if ( ! $template_path_norm || ! $stylesheet_path_norm ) {
+ $template_path_norm = wp_normalize_path( get_template_directory() );
+ $stylesheet_path_norm = wp_normalize_path( get_stylesheet_directory() );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $script_path_norm = wp_normalize_path( realpath( dirname( $metadata['file'] ) . '/' . $script_path ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_core_block = isset( $metadata['file'] ) && str_starts_with( $metadata['file'], $wpinc_path_norm );
- $is_theme_block = str_starts_with( $script_path_norm, $theme_path_norm );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_core_block = isset( $metadata['file'] ) && str_starts_with( $metadata['file'], $wpinc_path_norm );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Determine if the block script was registered in a theme, by checking if the script path starts with either
+ * the parent (template) or child (stylesheet) directory path.
+ */
+ $is_parent_theme_block = str_starts_with( $script_path_norm, $template_path_norm );
+ $is_child_theme_block = str_starts_with( $script_path_norm, $stylesheet_path_norm );
+ $is_theme_block = ( $is_parent_theme_block || $is_child_theme_block );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $script_uri = plugins_url( $script_path, $metadata['file'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $is_core_block ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $script_uri = includes_url( str_replace( $wpinc_path_norm, '', $script_path_norm ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $is_theme_block ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $script_uri = get_theme_file_uri( str_replace( $theme_path_norm, '', $script_path_norm ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get the script path deterministically based on whether or not it was registered in a parent or child theme.
+ $script_uri = $is_parent_theme_block
+ ? get_theme_file_uri( str_replace( $template_path_norm, '', $script_path_norm ) )
+ : get_theme_file_uri( str_replace( $stylesheet_path_norm, '', $script_path_norm ) );
</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"> $script_asset = require $script_asset_path;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,19 +251,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $has_style_file ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $style_uri = plugins_url( $style_path, $metadata['file'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Cache $theme_path_norm to avoid calling get_theme_file_path() multiple times.
- static $theme_path_norm = '';
- if ( ! $theme_path_norm ) {
- $theme_path_norm = wp_normalize_path( get_theme_file_path() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Cache $template_path_norm and $stylesheet_path_norm to avoid unnecessary additional calls.
+ static $template_path_norm = '';
+ static $stylesheet_path_norm = '';
+ if ( ! $template_path_norm || ! $stylesheet_path_norm ) {
+ $template_path_norm = wp_normalize_path( get_template_directory() );
+ $stylesheet_path_norm = wp_normalize_path( get_stylesheet_directory() );
</ins><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">- $is_theme_block = str_starts_with( $style_path_norm, $theme_path_norm );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Determine if the block style was registered in a theme, by checking if the script path starts with either
+ // the parent (template) or child (stylesheet) directory path.
+ $is_parent_theme_block = str_starts_with( $style_path_norm, $template_path_norm );
+ $is_child_theme_block = str_starts_with( $style_path_norm, $stylesheet_path_norm );
+ $is_theme_block = ( $is_parent_theme_block || $is_child_theme_block );
</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 ( $is_theme_block ) {
- $style_uri = get_theme_file_uri( str_replace( $theme_path_norm, '', $style_path_norm ) );
- } elseif ( $is_core_block ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $is_core_block ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // All possible $style_path variants for core blocks are hard-coded above.
</span><span class="cx" style="display: block; padding: 0 10px"> $style_uri = includes_url( 'blocks/' . str_replace( 'core/', '', $metadata['name'] ) . '/' . $style_path );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $is_theme_block ) {
+ // Get the script path deterministically based on whether or not it was registered in a parent or child theme.
+ $style_uri = $is_parent_theme_block
+ ? get_theme_file_uri( str_replace( $template_path_norm, '', $style_path_norm ) )
+ : get_theme_file_uri( str_replace( $stylesheet_path_norm, '', $style_path_norm ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $style_uri = false;
</span></span></pre>
</div>
</div>
</body>
</html>