<!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>[52312] trunk: Editor: Avoid `undefined index` notices in the Template Parts 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/52312">52312</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/52312","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>2021-12-03 15:28:21 +0000 (Fri, 03 Dec 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'>Editor: Avoid `undefined index` notices in the Template Parts Editor.
This changes adds a leading slash when needed in the `?context=edit` path to avoid an `undefined index` notice in the Template Parts Editor.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/52275">[52275]</a>.
Props kafleg, costdev, mukesh27, Boniu91.
Fixes <a href="https://core.trac.wordpress.org/ticket/54558">#54558</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblockeditorphp">trunk/src/wp-includes/block-editor.php</a></li>
<li><a href="#trunktestsphpunittestsblockseditorphp">trunk/tests/phpunit/tests/blocks/editor.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesblockeditorphp"></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-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/block-editor.php 2021-12-03 11:34:55 UTC (rev 52311)
+++ trunk/src/wp-includes/block-editor.php 2021-12-03 15:28:21 UTC (rev 52312)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -468,6 +468,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $backup_global_post = ! empty( $post ) ? clone $post : $post;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $preload_paths as &$path ) {
+ if ( is_string( $path ) && ! str_starts_with( $path, '/' ) ) {
+ $path = '/' . $path;
+ continue;
+ }
+
+ if ( is_array( $path ) && is_string( $path[0] ) && ! str_starts_with( $path[0], '/' ) ) {
+ $path[0] = '/' . $path[0];
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $preload_data = array_reduce(
</span><span class="cx" style="display: block; padding: 0 10px"> $preload_paths,
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_preload_api_request',
</span></span></pre></div>
<a id="trunktestsphpunittestsblockseditorphp"></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/editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/editor.php 2021-12-03 11:34:55 UTC (rev 52311)
+++ trunk/tests/phpunit/tests/blocks/editor.php 2021-12-03 15:28:21 UTC (rev 52312)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -493,4 +493,53 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( '"\/wp\/v2\/blocks"', $after );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( '"\/wp\/v2\/types"', $after );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 54558
+ * @dataProvider data_block_editor_rest_api_preload_adds_missing_leading_slash
+ *
+ * @covers ::block_editor_rest_api_preload
+ *
+ * @param array $preload_paths The paths to preload.
+ * @param string $expected The expected substring.
+ */
+ public function test_block_editor_rest_api_preload_adds_missing_leading_slash( array $preload_paths, $expected ) {
+ block_editor_rest_api_preload( $preload_paths, new WP_Block_Editor_Context() );
+ $haystack = implode( '', wp_scripts()->registered['wp-api-fetch']->extra['after'] );
+ $this->assertStringContainsString( $expected, $haystack );
+ }
+
+ /**
+ * Data provider.
+ *
+ * @return array
+ */
+ public function data_block_editor_rest_api_preload_adds_missing_leading_slash() {
+ return array(
+ 'a string without a slash' => array(
+ 'preload_paths' => array( 'wp/v2/blocks' ),
+ 'expected' => '\/wp\/v2\/blocks',
+ ),
+ 'a string with a slash' => array(
+ 'preload_paths' => array( '/wp/v2/blocks' ),
+ 'expected' => '\/wp\/v2\/blocks',
+ ),
+ 'a string starting with a question mark' => array(
+ 'preload_paths' => array( '?context=edit' ),
+ 'expected' => '/?context=edit',
+ ),
+ 'an array with a string without a slash' => array(
+ 'preload_paths' => array( array( 'wp/v2/blocks', 'OPTIONS' ) ),
+ 'expected' => '\/wp\/v2\/blocks',
+ ),
+ 'an array with a string with a slash' => array(
+ 'preload_paths' => array( array( '/wp/v2/blocks', 'OPTIONS' ) ),
+ 'expected' => '\/wp\/v2\/blocks',
+ ),
+ 'an array with a string starting with a question mark' => array(
+ 'preload_paths' => array( array( '?context=edit', 'OPTIONS' ) ),
+ 'expected' => '\/?context=edit',
+ ),
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>