<!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>[50983] trunk: Editor: Use the block editor context in filters that used the editor name</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/50983">50983</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/50983","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>gziolo</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-05-24 21:20:31 +0000 (Mon, 24 May 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: Use the block editor context in filters that used the editor name
Follow-up for <a href="https://core.trac.wordpress.org/changeset/50956">[50956]</a>.
Props azaozz, chrisvanpatten, timothyblynjacobs, youknowriad.
Fixes <a href="https://core.trac.wordpress.org/ticket/52920">#52920</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmineditformblocksphp">trunk/src/wp-admin/edit-form-blocks.php</a></li>
<li><a href="#trunksrcwpincludesblockeditorphp">trunk/src/wp-includes/block-editor.php</a></li>
<li><a href="#trunktestsphpunittestsblocksblockeditorphp">trunk/tests/phpunit/tests/blocks/block-editor.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmineditformblocksphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-form-blocks.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-form-blocks.php 2021-05-24 21:03:15 UTC (rev 50982)
+++ trunk/src/wp-admin/edit-form-blocks.php 2021-05-24 21:20:31 UTC (rev 50983)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> global $post_type, $post_type_object, $post, $title, $editor_styles, $wp_meta_boxes;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$editor_name = 'post-editor';
</del><span class="cx" style="display: block; padding: 0 10px"> $block_editor_context = new WP_Block_Editor_Context( array( 'post' => $post ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Flag that we're loading the block editor.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,7 +279,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $editor_settings['enableCustomFields'] );
</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">-$editor_settings = get_block_editor_settings( $editor_name, $editor_settings );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$editor_settings = get_block_editor_settings( $editor_settings, $block_editor_context );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $init_script = <<<JS
</span><span class="cx" style="display: block; padding: 0 10px"> ( function() {
</span></span></pre></div>
<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-05-24 21:03:15 UTC (rev 50982)
+++ trunk/src/wp-includes/block-editor.php 2021-05-24 21:20:31 UTC (rev 50983)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,16 +58,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Returns all the categories for block types that will be shown in the block editor.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.8.0 It is possible to pass the block editor context as param.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string|WP_Post $editor_name_or_post The name of the editor (e.g. 'post-editor')
- * or the post object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param WP_Post|WP_Block_Editor_Context $post_or_block_editor_context The current post object or
+ * the block editor context.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array[] Array of categories for block types.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function get_block_categories( $editor_name_or_post ) {
- // Assume the post editor when the WP_Post object passed.
- $editor_name = is_object( $editor_name_or_post ) ? 'post-editor' : $editor_name_or_post;
- $block_categories = get_default_block_categories();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function get_block_categories( $post_or_block_editor_context ) {
+ $block_categories = get_default_block_categories();
+ $block_editor_context = $post_or_block_editor_context instanceof WP_Post ?
+ new WP_Block_Editor_Context(
+ array(
+ 'post' => $post_or_block_editor_context,
+ )
+ ) : $post_or_block_editor_context;
</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"> * Filters the default array of categories for block types.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,12 +79,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array[] $block_categories Array of categories for block types.
- * @param string $editor_name The name of the editor, e.g. 'post-editor'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array[] $block_categories Array of categories for block types.
+ * @param WP_Block_Editor_Context $block_editor_context The current block editor context.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_categories = apply_filters( 'block_categories_all', $block_categories, $editor_name );
- if ( 'post-editor' === $editor_name ) {
- $post = is_object( $editor_name_or_post ) ? $editor_name_or_post : get_post();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $block_categories = apply_filters( 'block_categories_all', $block_categories, $block_editor_context );
+ if ( ! empty( $block_editor_context->post ) ) {
+ $post = $block_editor_context->post;
</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"> * Filters the default array of categories for block types.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,11 +106,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $editor_name The name of the editor (e.g. 'post-editor').
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param WP_Block_Editor_Context $block_editor_context The current block editor context.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool|array Array of block type slugs, or boolean to enable/disable all.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function get_allowed_block_types( $editor_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function get_allowed_block_types( $block_editor_context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $allowed_block_types = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,13 +120,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool|array $allowed_block_types Array of block type slugs, or
- * boolean to enable/disable all.
- * @param string $editor_name The name of the editor, e.g. 'post-editor'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool|array $allowed_block_types Array of block type slugs, or
+ * boolean to enable/disable all.
+ * @param WP_Block_Editor_Context $block_editor_context The current block editor context.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $allowed_block_types = apply_filters( 'allowed_block_types_all', $allowed_block_types, $editor_name );
- if ( 'post-editor' === $editor_name ) {
- $post = get_post();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowed_block_types = apply_filters( 'allowed_block_types_all', $allowed_block_types, $block_editor_context );
+ if ( ! empty( $block_editor_context->post ) ) {
+ $post = $block_editor_context->post;
</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"> * Filters the allowed block types for the editor, defaulting to true (all
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,21 +229,21 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Returns the contextualized block editor settings settings for a selected editor type.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Returns the contextualized block editor settings settings for a selected editor context.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $editor_name The name of the editor (e.g. 'post-editor').
- * @param array $custom_settings Optional custom settings to use with the editor type.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $custom_settings Custom settings to use with the given editor type.
+ * @param WP_Block_Editor_Context $block_editor_context The current block editor context.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array The contextualized block editor settings.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function get_block_editor_settings( $editor_name, $custom_settings = array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function get_block_editor_settings( array $custom_settings, $block_editor_context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $editor_settings = array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> get_default_block_editor_settings(),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'allowedBlockTypes' => get_allowed_block_types( $editor_name ),
- 'blockCategories' => get_block_categories( $editor_name ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'allowedBlockTypes' => get_allowed_block_types( $block_editor_context ),
+ 'blockCategories' => get_block_categories( $block_editor_context ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> $custom_settings
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,12 +306,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $editor_settings Default editor settings.
- * @param string $editor_name The name of the editor, e.g. 'post-editor'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $editor_settings Default editor settings.
+ * @param WP_Block_Editor_Context $block_editor_context The current block editor context.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor_settings = apply_filters( 'block_editor_settings_all', $editor_settings, $editor_name );
- if ( 'post-editor' === $editor_name ) {
- $post = get_post();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $editor_settings = apply_filters( 'block_editor_settings_all', $editor_settings, $block_editor_context );
+ if ( ! empty( $block_editor_context->post ) ) {
+ $post = $block_editor_context->post;
</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"> * Filters the settings to pass to the block editor.
</span></span></pre></div>
<a id="trunktestsphpunittestsblocksblockeditorphp"></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/block-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/block-editor.php 2021-05-24 21:03:15 UTC (rev 50982)
+++ trunk/tests/phpunit/tests/blocks/block-editor.php 2021-05-24 21:20:31 UTC (rev 50983)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,9 +76,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52920
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_block_editor_context_post() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $context = new WP_Block_Editor_Context( array( 'post' => $this->post ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $context = new WP_Block_Editor_Context( array( 'post' => get_post() ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $this->post, $context->post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( get_post(), $context->post );
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +111,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_block_categories_deprecated_filter_post_editor() {
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'block_categories', array( $this, 'filter_set_block_categories_post' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_categories = get_block_categories( 'post-editor' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_editor_context = new WP_Block_Editor_Context( array( 'post' => get_post() ) );
+ $block_categories = get_block_categories( $post_editor_context );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'block_categories', array( $this, 'filter_set_block_categories_post' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,7 +132,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52920
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_allowed_block_types_default() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $allowed_block_types = get_allowed_block_types( 'post-editor' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_editor_context = new WP_Block_Editor_Context( array( 'post' => get_post() ) );
+ $allowed_block_types = get_allowed_block_types( $post_editor_context );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $allowed_block_types );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,7 +145,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_allowed_block_types_deprecated_filter_post_editor() {
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'allowed_block_types', array( $this, 'filter_set_allowed_block_types_post' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $allowed_block_types = get_allowed_block_types( 'post-editor' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_editor_context = new WP_Block_Editor_Context( array( 'post' => get_post() ) );
+ $allowed_block_types = get_allowed_block_types( $post_editor_context );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'allowed_block_types', array( $this, 'filter_set_allowed_block_types_post' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,7 +282,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'block_categories_all', 'filter_block_categories_my_editor', 10, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'block_editor_settings_all', 'filter_block_editor_settings_my_editor', 10, 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">- $settings = get_block_editor_settings( 'my-editor' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $my_editor_context = new WP_Block_Editor_Context();
+ $settings = get_block_editor_settings( array(), $my_editor_context );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'allowed_block_types_all', 'filter_allowed_block_types_my_editor' );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'block_categories_all', 'filter_block_categories_my_editor' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,7 +310,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_block_editor_settings_deprecated_filter_post_editor() {
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'block_editor_settings', array( $this, 'filter_set_block_editor_settings_post' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $settings = get_block_editor_settings( 'post-editor' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_editor_context = new WP_Block_Editor_Context( array( 'post' => get_post() ) );
+ $settings = get_block_editor_settings( array(), $post_editor_context );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'block_editor_settings', array( $this, 'filter_set_block_editor_settings_post' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,8 +327,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52920
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_block_editor_rest_api_preload_no_paths() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $context = new WP_Block_Editor_Context();
- block_editor_rest_api_preload( array(), $context );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $editor_context = new WP_Block_Editor_Context();
+ block_editor_rest_api_preload( array(), $editor_context );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $after = implode( '', wp_scripts()->registered['wp-api-fetch']->extra['after'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotContains( 'wp.apiFetch.createPreloadingMiddleware', $after );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,12 +347,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'block_editor_preload_paths', 'filter_remove_preload_paths', 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $context = new WP_Block_Editor_Context( array( 'post' => get_post() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_editor_context = new WP_Block_Editor_Context( array( 'post' => get_post() ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> block_editor_rest_api_preload(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/wp/v2/blocks', 'OPTIONS' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $context
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_editor_context
</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"> remove_filter( 'block_editor_preload_paths', 'filter_remove_preload_paths' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -369,12 +374,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'block_editor_rest_api_preload_paths', 'filter_add_preload_paths', 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $context = new WP_Block_Editor_Context();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $editor_context = new WP_Block_Editor_Context();
</ins><span class="cx" style="display: block; padding: 0 10px"> block_editor_rest_api_preload(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/wp/v2/blocks', 'OPTIONS' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $context
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $editor_context
</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"> remove_filter( 'block_editor_rest_api_preload_paths', 'filter_add_preload_paths' );
</span></span></pre>
</div>
</div>
</body>
</html>