WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Editor: Shape block editor filters to work better with the Gutenberg plugin 

This should allow to use new filters in the Gutenberg plugin and therefore it prevents deprecation warnings when in the debug mode.

See #52920.


Built from https://develop.svn.wordpress.org/trunk@50777


git-svn-id: http://core.svn.wordpress.org/trunk@50386 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
gziolo 2021-04-21 09:32:06 +00:00
parent f4f125b869
commit 267f9d7479
2 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
wp-includes/block-editor.php
View File

@ -66,17 +66,18 @@ function get_default_block_categories() {
*/ */
function get_block_categories( $editor_name_or_post ) { function get_block_categories( $editor_name_or_post ) {
// Assume the post editor when the WP_Post object passed. // Assume the post editor when the WP_Post object passed.
$editor_name = is_object( $editor_name_or_post ) ? 'post-editor' : $editor_name_or_post; $editor_name = is_object( $editor_name_or_post ) ? 'post-editor' : $editor_name_or_post;
$default_categories = get_default_block_categories(); $block_categories = get_default_block_categories();
/** /**
* Filters the default array of categories for block types. * Filters the default array of categories for block types.
* *
* @since 5.8.0 * @since 5.8.0
* *
* @param array[] $default_categories Array of categories for block types. * @param array[] $block_categories Array of categories for block types.
* @param string $editor_name The name of the editor, e.g. 'post-editor'.
*/ */
$block_categories = apply_filters( "block_categories_{$editor_name}", $default_categories ); $block_categories = apply_filters( 'block_categories_all', $block_categories, $editor_name );
if ( 'post-editor' === $editor_name ) { if ( 'post-editor' === $editor_name ) {
$post = is_object( $editor_name_or_post ) ? $editor_name_or_post : get_post(); $post = is_object( $editor_name_or_post ) ? $editor_name_or_post : get_post();
@ -89,7 +90,7 @@ function get_block_categories( $editor_name_or_post ) {
* @param array[] $block_categories Array of categories for block types. * @param array[] $block_categories Array of categories for block types.
* @param WP_Post $post Post being loaded. * @param WP_Post $post Post being loaded.
*/ */
$block_categories = apply_filters_deprecated( 'block_categories', array( $block_categories, $post ), '5.8.0', "block_categories_{$editor_name}" ); $block_categories = apply_filters_deprecated( 'block_categories', array( $block_categories, $post ), '5.8.0', 'block_categories_all' );
} }
return $block_categories; return $block_categories;
@ -108,15 +109,32 @@ function get_allowed_block_types( $editor_name ) {
$allowed_block_types = true; $allowed_block_types = true;
/** /**
* Filters the allowed block types for the given editor, defaulting to true (all * Filters the allowed block types for all editor types, defaulting to `true`
* registered block types supported). * (all registered block types supported).
*
* *
* @since 5.8.0 * @since 5.8.0
* *
* @param bool|array $allowed_block_types Array of block type slugs, or * @param bool|array $allowed_block_types Array of block type slugs, or
* boolean to enable/disable all. * boolean to enable/disable all.
* @param string $editor_name The name of the editor, e.g. 'post-editor'.
*/ */
$allowed_block_types = apply_filters( "allowed_block_types_{$editor_name}", $allowed_block_types ); $allowed_block_types = apply_filters( 'allowed_block_types_all', $allowed_block_types, $editor_name );
/**
* Filters the allowed block types for the given editor, defaulting to `true`
* (all registered block types supported).
*
* The dynamic portion of the hook name, `$editor_name`, refers to the name
* of the editor type, e.g. 'post-editor', 'site-editor', etc.
*
* @since 5.8.0
*
* @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'.
*/
$allowed_block_types = apply_filters( "allowed_block_types_{$editor_name}", $allowed_block_types, $editor_name );
if ( 'post-editor' === $editor_name ) { if ( 'post-editor' === $editor_name ) {
$post = get_post(); $post = get_post();
@ -131,7 +149,7 @@ function get_allowed_block_types( $editor_name ) {
* boolean to enable/disable all. * boolean to enable/disable all.
* @param WP_Post $post The post resource data. * @param WP_Post $post The post resource data.
*/ */
$allowed_block_types = apply_filters_deprecated( 'allowed_block_types', array( $allowed_block_types, $post ), '5.8.0', "allowed_block_types_{$editor_name}" ); $allowed_block_types = apply_filters_deprecated( 'allowed_block_types', array( $allowed_block_types, $post ), '5.8.0', 'allowed_block_types_all' );
} }
return $allowed_block_types; return $allowed_block_types;
@ -241,13 +259,27 @@ function get_block_editor_settings( $editor_name, $custom_settings = array() ) {
); );
/** /**
* Filters the settings to pass to the block editor for a given editor type. * Filters the settings to pass to the block editor for all editor type.
* *
* @since 5.8.0 * @since 5.8.0
* *
* @param array $editor_settings Default editor settings. * @param array $editor_settings Default editor settings.
* @param string $editor_name The name of the editor, e.g. 'post-editor'.
*/ */
$editor_settings = apply_filters( "block_editor_settings_{$editor_name}", $editor_settings ); $editor_settings = apply_filters( 'block_editor_settings_all', $editor_settings, $editor_name );
/**
* Filters the settings to pass to the block editor for a given editor type.
*
* The dynamic portion of the hook name, `$editor_name`, refers to the name
* of the editor type, e.g. 'post-editor', 'site-editor', etc.
*
* @since 5.8.0
*
* @param array $editor_settings Default editor settings.
* @param string $editor_name The name of the editor, e.g. 'post-editor'.
*/
$editor_settings = apply_filters( "block_editor_settings_{$editor_name}", $editor_settings, $editor_name );
if ( 'post-editor' === $editor_name ) { if ( 'post-editor' === $editor_name ) {
$post = get_post(); $post = get_post();
@ -260,7 +292,7 @@ function get_block_editor_settings( $editor_name, $custom_settings = array() ) {
* @param array $editor_settings Default editor settings. * @param array $editor_settings Default editor settings.
* @param WP_Post $post Post being edited. * @param WP_Post $post Post being edited.
*/ */
$editor_settings = apply_filters_deprecated( 'block_editor_settings', array( $editor_settings, $post ), '5.8.0', "block_editor_settings_{$editor_name}" ); $editor_settings = apply_filters_deprecated( 'block_editor_settings', array( $editor_settings, $post ), '5.8.0', 'block_editor_settings_all' );
} }
return $editor_settings; return $editor_settings;

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.8-alpha-50776'; $wp_version = '5.8-alpha-50777';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.