<!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>[51168] trunk/src/wp-includes: Docs: Update syntax for some multi-line comments per the documentation standards.</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/51168">51168</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/51168","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-06-16 09:41:44 +0000 (Wed, 16 Jun 2021)</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'>Docs: Update syntax for some multi-line comments per the documentation standards.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/51003">[51003]</a>, <a href="https://core.trac.wordpress.org/changeset/51149">[51149]</a>.
See <a href="https://core.trac.wordpress.org/ticket/52628">#52628</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblocktemplatephp">trunk/src/wp-includes/block-template.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemejsonphp">trunk/src/wp-includes/class-wp-theme-json.php</a></li>
<li><a href="#trunksrcwpincludesthemetemplatesphp">trunk/src/wp-includes/theme-templates.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesblocktemplatephp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/block-template.php 2021-06-15 21:36:07 UTC (rev 51167)
+++ trunk/src/wp-includes/block-template.php 2021-06-16 09:41:44 UTC (rev 51168)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,11 +23,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $_wp_current_template_content;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $template ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // locate_template() has found a PHP template at the path specified by $template.
- // That means that we have a fallback candidate if we cannot find a block template
- // with higher specificity.
- // Thus, before looking for matching block themes, we shorten our list of candidate
- // templates accordingly.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * locate_template() has found a PHP template at the path specified by $template.
+ * That means that we have a fallback candidate if we cannot find a block template
+ * with higher specificity.
+ *
+ * Thus, before looking for matching block themes, we shorten our list of candidate
+ * templates accordingly.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Locate the index of $template (without the theme directory path) in $templates.
</span><span class="cx" style="display: block; padding: 0 10px"> $relative_template_path = str_replace(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,11 +221,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _block_template_render_without_post_block_context( $context ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * When loading a template directly and not through a page
- * that resolves it, the top-level post ID and type context get set to that
- * of the template. Templates are just the structure of a site, and
- * they should not be available as post context because blocks like Post
- * Content would recurse infinitely.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * When loading a template directly and not through a page that resolves it,
+ * the top-level post ID and type context get set to that of the template.
+ * Templates are just the structure of a site, and they should not be available
+ * as post context because blocks like Post Content would recurse infinitely.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $context['postType'] ) && 'wp_template' === $context['postType'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $context['postId'] );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpthemejsonphp"></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/class-wp-theme-json.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme-json.php 2021-06-15 21:36:07 UTC (rev 51167)
+++ trunk/src/wp-includes/class-wp-theme-json.php 2021-06-16 09:41:44 UTC (rev 51168)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1098,9 +1098,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $incoming_data = $incoming->get_raw_data();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->theme_json = array_replace_recursive( $this->theme_json, $incoming_data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // The array_replace_recursive algorithm merges at the leaf level.
- // For leaf values that are arrays it will use the numeric indexes for replacement.
- // In those cases, we want to replace the existing with the incoming value, if it exists.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * The array_replace_recursive() algorithm merges at the leaf level.
+ * For leaf values that are arrays it will use the numeric indexes for replacement.
+ * In those cases, we want to replace the existing with the incoming value, if it exists.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $to_replace = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $to_replace[] = array( 'custom' );
</span><span class="cx" style="display: block; padding: 0 10px"> $to_replace[] = array( 'spacing', 'units' );
</span></span></pre></div>
<a id="trunksrcwpincludesthemetemplatesphp"></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/theme-templates.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme-templates.php 2021-06-15 21:36:07 UTC (rev 51167)
+++ trunk/src/wp-includes/theme-templates.php 2021-06-16 09:41:44 UTC (rev 51168)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,12 +22,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $override_slug = $slug;
</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">- // Template slugs must be unique within the same theme.
- // TODO - Figure out how to update this to work for a multi-theme
- // environment. Unfortunately using `get_the_terms` for the 'wp-theme'
- // term does not work in the case of new entities since is too early in
- // the process to have been saved to the entity. So for now we use the
- // currently activated theme for creation.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Template slugs must be unique within the same theme.
+ * TODO - Figure out how to update this to work for a multi-theme environment.
+ * Unfortunately using `get_the_terms()` for the 'wp-theme' term does not work
+ * in the case of new entities since is too early in the process to have been saved
+ * to the entity. So for now we use the currently activated theme for creation.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme = wp_get_theme()->get_stylesheet();
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_the_terms( $post_ID, 'wp_theme' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $terms && ! is_wp_error( $terms ) ) {
</span></span></pre>
</div>
</div>
</body>
</html>