<!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>[59122] trunk: Block bindings: Add canUpdateBlockBindings editor setting.</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/59122">59122</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/59122","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>cbravobernal</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-09-30 06:47:20 +0000 (Mon, 30 Sep 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'>Block bindings: Add canUpdateBlockBindings editor setting.
Adds a `canUpdateBlockBindings` editor setting that allows to decide if the user is able to create and modify bindings through the UI. By default, only admin users can do it, but it can be overridden with `block_editor_settings_all` filter.
Props santosguillamot, gziolo, jorbin, noisysocks, matveb, cbravobernal, youknowriad, mamaduka, timothyblynjacobs, peterwilsoncc, drivingralle.
Fixes <a href="https://core.trac.wordpress.org/ticket/61945">#61945</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblockeditorphp">trunk/src/wp-includes/block-editor.php</a></li>
<li><a href="#trunksrcwpincludescapabilitiesphp">trunk/src/wp-includes/capabilities.php</a></li>
<li><a href="#trunktestsphpunittestsusercapabilitiesphp">trunk/tests/phpunit/tests/user/capabilities.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 2024-09-30 05:27:06 UTC (rev 59121)
+++ trunk/src/wp-includes/block-editor.php 2024-09-30 06:47:20 UTC (rev 59122)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -665,6 +665,8 @@
</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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $editor_settings['canUpdateBlockBindings'] = current_user_can( 'edit_block_binding', $block_editor_context );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the settings to pass to the block editor for all editor type.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludescapabilitiesphp"></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/capabilities.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/capabilities.php 2024-09-30 05:27:06 UTC (rev 59121)
+++ trunk/src/wp-includes/capabilities.php 2024-09-30 06:47:20 UTC (rev 59122)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -801,6 +801,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'delete_app_password':
</span><span class="cx" style="display: block; padding: 0 10px"> $caps = map_meta_cap( 'edit_user', $user_id, $args[0] );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'edit_block_binding':
+ $block_editor_context = $args[0];
+ if ( isset( $block_editor_context->post ) ) {
+ $object_id = $block_editor_context->post->ID;
+ }
+ /*
+ * If the post ID is null, check if the context is the site editor.
+ * Fall back to the edit_theme_options in that case.
+ */
+ if ( ! isset( $object_id ) ) {
+ if ( ! isset( $block_editor_context->name ) || 'core/edit-site' !== $block_editor_context->name ) {
+ $caps[] = 'do_not_allow';
+ break;
+ }
+ $caps = map_meta_cap( 'edit_theme_options', $user_id );
+ break;
+ }
+
+ $object_subtype = get_object_subtype( 'post', (int) $object_id );
+ if ( empty( $object_subtype ) ) {
+ $caps[] = 'do_not_allow';
+ break;
+ }
+
+ $caps = map_meta_cap( "edit_{$object_subtype}", $user_id, $object_id );
+ break;
</ins><span class="cx" style="display: block; padding: 0 10px"> default:
</span><span class="cx" style="display: block; padding: 0 10px"> // Handle meta capabilities for custom post types.
</span><span class="cx" style="display: block; padding: 0 10px"> global $post_type_meta_caps;
</span></span></pre></div>
<a id="trunktestsphpunittestsusercapabilitiesphp"></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/user/capabilities.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/capabilities.php 2024-09-30 05:27:06 UTC (rev 59121)
+++ trunk/tests/phpunit/tests/user/capabilities.php 2024-09-30 06:47:20 UTC (rev 59122)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -570,7 +570,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['read_app_password'],
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['edit_app_password'],
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['delete_app_passwords'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected['delete_app_password']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected['delete_app_password'],
+ $expected['edit_block_binding']
</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"> $expected = array_keys( $expected );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2376,4 +2377,52 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $data;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Test `edit_block_binding` meta capability is properly mapped.
+ *
+ * @ticket 61945
+ */
+ public function test_edit_block_binding_caps_are_mapped_correctly() {
+ $author = self::$users['administrator'];
+ $post = self::factory()->post->create_and_get(
+ array(
+ 'post_author' => $author->ID,
+ 'post_type' => 'post',
+ )
+ );
+
+ foreach ( self::$users as $role => $user ) {
+ // It should map to `edit_{post_type}` if editing a post.
+ $this->assertSame(
+ user_can( $user->ID, 'edit_post', $post->ID ),
+ user_can(
+ $user->ID,
+ 'edit_block_binding',
+ new WP_Block_Editor_Context(
+ array(
+ 'post' => $post,
+ 'name' => 'core/edit-post',
+ )
+ )
+ ),
+ "Role: {$role} in post editing"
+ );
+ // It should map to `edit_theme_options` if editing a template.
+ $this->assertSame(
+ user_can( $user->ID, 'edit_theme_options' ),
+ user_can(
+ $user->ID,
+ 'edit_block_binding',
+ new WP_Block_Editor_Context(
+ array(
+ 'post' => null,
+ 'name' => 'core/edit-site',
+ )
+ )
+ ),
+ "Role: {$role} in template editing"
+ );
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>