<!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>[55830] branches/6.1: Editor: Restore shortcode support for block templates.</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/55830">55830</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/55830","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-05-20 04:02:09 +0000 (Sat, 20 May 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: Restore shortcode support for block templates.

Follow up to <a href="https://core.trac.wordpress.org/changeset/55761">[55761]</a>.

Props youknowriad, Clorith, desrosj, antpb, Otto42, johnbillion, jorbin, rmccue, timothyblynjacobs, mikeschroder, peterwilsoncc, audrasjb, matveb, noisysocks, xknown, ehtis, isabel_brison, talldanwp, gziolo, chriscct7, davidbaumwald.
Merges <a href="https://core.trac.wordpress.org/changeset/55828">[55828]</a> to the 6.1 branch.
See <a href="https://core.trac.wordpress.org/ticket/58333">#58333</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches61packagelockjson">branches/6.1/package-lock.json</a></li>
<li><a href="#branches61packagejson">branches/6.1/package.json</a></li>
<li><a href="#branches61srcwpincludesblocktemplatephp">branches/6.1/src/wp-includes/block-template.php</a></li>
<li><a href="#branches61srcwpincludesblockspostfeaturedimagephp">branches/6.1/src/wp-includes/blocks/post-featured-image.php</a></li>
<li><a href="#branches61srcwpincludesblockstemplatepartphp">branches/6.1/src/wp-includes/blocks/template-part.php</a></li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#branches61">branches/6.1/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/6.1
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/6.1 2023-05-20 04:01:19 UTC (rev 55829)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/6.1  2023-05-20 04:02:09 UTC (rev 55830)
</ins><a id="branches61"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/6.1</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.8:51889
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:54645-54646,54649,54651-54652,54660,54662,54669,54674,54678,54686,54690,54693,54698,54706,54724,54729-54730,54733,54741,54745,54751,54766,54768-54771,54774,54777,54782,54785-54789,54797,54799,54801-54804,54811,54813,54815,54817,54819,54821,54823-54824,54829,54836,54849,54878,54968,55350,55462,55487
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:54645-54646,54649,54651-54652,54660,54662,54669,54674,54678,54686,54690,54693,54698,54706,54724,54729-54730,54733,54741,54745,54751,54766,54768-54771,54774,54777,54782,54785-54789,54797,54799,54801-54804,54811,54813,54815,54817,54819,54821,54823-54824,54829,54836,54849,54878,54968,55350,55462,55487,55828
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches61packagelockjson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/package-lock.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/package-lock.json    2023-05-20 04:01:19 UTC (rev 55829)
+++ branches/6.1/package-lock.json      2023-05-20 04:02:09 UTC (rev 55830)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4021,9 +4021,9 @@
</span><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">                "@wordpress/block-directory": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "3.15.11",
-                       "resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-3.15.11.tgz",
-                       "integrity": "sha512-KiQrYfxkiLrrQJgRaw1C32a9vXbNEZorEd0KuEVRZs4LYtNOKj/Je1low4Tvj77lh870Q38SiOCMWgtqtRtRJA==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "3.15.13",
+                       "resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-3.15.13.tgz",
+                       "integrity": "sha512-xlHKFQkx1Hi/Ka07PG449fiz6us5exuQ9S0guoRpFHK+oR/XDLn7dLnk4VEPWIRupWM9POV8kHEJvK83+Pojjw==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@babel/runtime": "^7.16.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/a11y": "^3.17.1",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4034,7 +4034,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/compose": "^5.15.2",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/core-data": "^5.0.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/data": "^7.1.3",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/edit-post": "^6.14.11",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/edit-post": "^6.14.13",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/editor": "^12.16.10",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/element": "^4.15.1",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/hooks": "^3.17.1",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4095,9 +4095,9 @@
</span><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">                "@wordpress/block-library": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "7.14.11",
-                       "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-7.14.11.tgz",
-                       "integrity": "sha512-BiLDYp1snS+FCzNWJJEjMxNjKlhLTRQgKzNUwiK/UIQr/5Drif6GNPsNOiFs3ha5kKZli7l4CyFHiZE99PNiJA==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "7.14.13",
+                       "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-7.14.13.tgz",
+                       "integrity": "sha512-NHU5xRimeUk0FRzvuZuxa5V/5gj8t2CsU/VkPSrtup5Ijywhut1AJfWlqhDgRP42MMHhzGTHD6TjKcPOHZFsZQ==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@babel/runtime": "^7.16.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/a11y": "^3.17.1",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4300,13 +4300,13 @@
</span><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">                "@wordpress/customize-widgets": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "3.14.11",
-                       "resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-3.14.11.tgz",
-                       "integrity": "sha512-aJ/++NFDjirmTF0zAbOzfKSeX+6sMK0vjv07Pjis4gztRJ4P+lfYaj/aUCjQz/OhJwaw1jyQNx3FxcbS3L/iLg==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "3.14.13",
+                       "resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-3.14.13.tgz",
+                       "integrity": "sha512-V/0eTab5KEBh+BVxOcXSJ5GfSHds5STLW5ZjXG4oRJjJQhSBknVufpGsZYlr0NlhpPkzGz6zHQSUKGhlWLAi0g==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@babel/runtime": "^7.16.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/block-editor": "^10.0.10",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/block-library": "^7.14.11",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/block-library": "^7.14.13",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/blocks": "^11.16.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/components": "^21.0.7",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/compose": "^5.15.2",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4451,15 +4451,15 @@
</span><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">                "@wordpress/edit-post": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "6.14.11",
-                       "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-6.14.11.tgz",
-                       "integrity": "sha512-ZqNPUlCRBRd4rUYExTVDmaIX/J0yAwaZybtcfSWPacrNnq40xrv16wrLFNZAFn5oCTrKAkuTWWjsjuQhEbw8yg==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "6.14.13",
+                       "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-6.14.13.tgz",
+                       "integrity": "sha512-jDBjIILhdrS16KzWeVwhqL0qCLHd7JfLqvtgBdCdJUEJ+8xtMzldE3D6Y/lF2M0SToDZYWhYSeW7TfZoMRhjfg==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@babel/runtime": "^7.16.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/a11y": "^3.17.1",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/api-fetch": "^6.14.1",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/block-editor": "^10.0.10",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/block-library": "^7.14.11",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/block-library": "^7.14.13",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/blocks": "^11.16.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/components": "^21.0.7",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/compose": "^5.15.2",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4488,15 +4488,15 @@
</span><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">                "@wordpress/edit-site": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "4.14.13",
-                       "resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-4.14.13.tgz",
-                       "integrity": "sha512-A5mmwIOSVgiJ1QoCHfnO+ehECoI4gW/g0/GDCpvxbEiHLhexKh3aNDwsy2izO990IoAd1h55hYPYAUBxNX8a+w==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "4.14.15",
+                       "resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-4.14.15.tgz",
+                       "integrity": "sha512-ZP3TnE6nXvODhVDkruayCLa/ahPdVF56IWQwN1KfR8KIGunIMJkEpWE/C5rRz9sp5J01wOJY8/QMkrKUauHHBA==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@babel/runtime": "^7.16.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/a11y": "^3.17.1",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/api-fetch": "^6.14.1",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/block-editor": "^10.0.10",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/block-library": "^7.14.11",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/block-library": "^7.14.13",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/blocks": "^11.16.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/components": "^21.0.7",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/compose": "^5.15.2",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4529,14 +4529,14 @@
</span><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">                "@wordpress/edit-widgets": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "4.14.11",
-                       "resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-4.14.11.tgz",
-                       "integrity": "sha512-5nb583zlv/YZCbIfEkV7gTk+UddZNDGr1C4B/7EWAjNhQAg3/dv3eqD0N/WYTYLxBAUI3O2heO0i85/AiGqUKg==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "4.14.13",
+                       "resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-4.14.13.tgz",
+                       "integrity": "sha512-JPtT1UaiPs5SZBGHVSNeUX8D93hQrsmGmHoKu7Ja5TbbWGvOiRVaqcG3hFSP0aZpMvecY8uBWi5f8WWP+bPK3g==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@babel/runtime": "^7.16.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/api-fetch": "^6.14.1",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/block-editor": "^10.0.10",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/block-library": "^7.14.11",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/block-library": "^7.14.13",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/blocks": "^11.16.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/components": "^21.0.7",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/compose": "^5.15.2",
</span></span></pre></div>
<a id="branches61packagejson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/package.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/package.json 2023-05-20 04:01:19 UTC (rev 55829)
+++ branches/6.1/package.json   2023-05-20 04:02:09 UTC (rev 55830)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,15 +81,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/api-fetch": "6.14.1",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/autop": "3.17.1",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/blob": "3.17.1",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                "@wordpress/block-directory": "3.15.11",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/block-directory": "3.15.13",
</ins><span class="cx" style="display: block; padding: 0 10px">                 "@wordpress/block-editor": "10.0.10",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                "@wordpress/block-library": "7.14.11",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/block-library": "7.14.13",
</ins><span class="cx" style="display: block; padding: 0 10px">                 "@wordpress/block-serialization-default-parser": "4.17.1",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/blocks": "11.16.4",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/components": "21.0.7",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/compose": "5.15.2",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/core-data": "5.0.4",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                "@wordpress/customize-widgets": "3.14.11",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/customize-widgets": "3.14.13",
</ins><span class="cx" style="display: block; padding: 0 10px">                 "@wordpress/data": "7.1.3",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/data-controls": "2.17.3",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/date": "4.17.1",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,9 +96,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/deprecated": "3.17.1",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/dom": "3.17.2",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/dom-ready": "3.17.1",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                "@wordpress/edit-post": "6.14.11",
-               "@wordpress/edit-site": "4.14.13",
-               "@wordpress/edit-widgets": "4.14.11",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/edit-post": "6.14.13",
+               "@wordpress/edit-site": "4.14.15",
+               "@wordpress/edit-widgets": "4.14.13",
</ins><span class="cx" style="display: block; padding: 0 10px">                 "@wordpress/editor": "12.16.10",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/element": "4.15.1",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/escape-html": "2.17.1",
</span></span></pre></div>
<a id="branches61srcwpincludesblocktemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/src/wp-includes/block-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/src/wp-includes/block-template.php   2023-05-20 04:01:19 UTC (rev 55829)
+++ branches/6.1/src/wp-includes/block-template.php     2023-05-20 04:02:09 UTC (rev 55830)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,6 +237,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        $content = $wp_embed->run_shortcode( $_wp_current_template_content );
</span><span class="cx" style="display: block; padding: 0 10px">        $content = $wp_embed->autoembed( $content );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        $content = shortcode_unautop( $content );
+       $content = do_shortcode( $content );
</ins><span class="cx" style="display: block; padding: 0 10px">         $content = do_blocks( $content );
</span><span class="cx" style="display: block; padding: 0 10px">        $content = wptexturize( $content );
</span><span class="cx" style="display: block; padding: 0 10px">        $content = convert_smilies( $content );
</span></span></pre></div>
<a id="branches61srcwpincludesblockspostfeaturedimagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/src/wp-includes/blocks/post-featured-image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/src/wp-includes/blocks/post-featured-image.php       2023-05-20 04:01:19 UTC (rev 55829)
+++ branches/6.1/src/wp-includes/blocks/post-featured-image.php 2023-05-20 04:02:09 UTC (rev 55830)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,6 +19,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px">        $post_ID = $block->context['postId'];
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        // Check is needed for backward compatibility with third-party plugins
+       // that might rely on the `in_the_loop` check; calling `the_post` sets it to true.
+       if ( ! in_the_loop() && have_posts() ) {
+               the_post();
+       }
+
</ins><span class="cx" style="display: block; padding: 0 10px">         $is_link        = isset( $attributes['isLink'] ) && $attributes['isLink'];
</span><span class="cx" style="display: block; padding: 0 10px">        $size_slug      = isset( $attributes['sizeSlug'] ) ? $attributes['sizeSlug'] : 'post-thumbnail';
</span><span class="cx" style="display: block; padding: 0 10px">        $post_title     = trim( strip_tags( get_the_title( $post_ID ) ) );
</span></span></pre></div>
<a id="branches61srcwpincludesblockstemplatepartphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/src/wp-includes/blocks/template-part.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/src/wp-includes/blocks/template-part.php     2023-05-20 04:01:19 UTC (rev 55829)
+++ branches/6.1/src/wp-includes/blocks/template-part.php       2023-05-20 04:02:09 UTC (rev 55830)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,14 +128,14 @@
</span><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">        // Run through the actions that are typically taken on the_content.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        $content                       = shortcode_unautop( $content );
+       $content                       = do_shortcode( $content );
</ins><span class="cx" style="display: block; padding: 0 10px">         $seen_ids[ $template_part_id ] = true;
</span><span class="cx" style="display: block; padding: 0 10px">        $content                       = do_blocks( $content );
</span><span class="cx" style="display: block; padding: 0 10px">        unset( $seen_ids[ $template_part_id ] );
</span><span class="cx" style="display: block; padding: 0 10px">        $content = wptexturize( $content );
</span><span class="cx" style="display: block; padding: 0 10px">        $content = convert_smilies( $content );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $content = shortcode_unautop( $content );
</del><span class="cx" style="display: block; padding: 0 10px">         $content = wp_filter_content_tags( $content );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $content = do_shortcode( $content );
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        // Handle embeds for block template parts.
</span><span class="cx" style="display: block; padding: 0 10px">        global $wp_embed;
</span></span></pre>
</div>
</div>

</body>
</html>