From 13195cfe8e5f2d7241602eaa1d4e3c01497cdd2d Mon Sep 17 00:00:00 2001 From: hellofromTonya Date: Wed, 1 Mar 2023 15:05:19 +0000 Subject: [PATCH] Editor: Partial revert of r55230. [55230] introduced a regression to the content markup. This changeset is a partial revert to remove the added `wp-includes/block-supports/anchor.php` file. The change of adding `'id'` to `$attributes_to_merge` in `get_block_wrapper_attributes()` is not reverted as this change did not impact the regression and helps to support continue development in Gutenberg for the anchor support in dynamic blocks feature. Reference: * [https://github.com/WordPress/gutenberg/pull/48592 Gutenberg PR 48592]. Follow-up [55230]. Props wildworks, mamaduka, hellofromTonya. Fixes #57830. See #56852. Built from https://develop.svn.wordpress.org/trunk@55443 git-svn-id: http://core.svn.wordpress.org/trunk@54976 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/block-supports/anchor.php | 73 --------------------------- wp-includes/version.php | 2 +- wp-settings.php | 1 - 3 files changed, 1 insertion(+), 75 deletions(-) delete mode 100644 wp-includes/block-supports/anchor.php diff --git a/wp-includes/block-supports/anchor.php b/wp-includes/block-supports/anchor.php deleted file mode 100644 index e71cab0adf..0000000000 --- a/wp-includes/block-supports/anchor.php +++ /dev/null @@ -1,73 +0,0 @@ -supports, array( 'anchor' ), true ); - if ( ! $has_anchor_support ) { - return; - } - - if ( ! $block_type->attributes ) { - $block_type->attributes = array(); - } - - if ( ! array_key_exists( 'anchor', $block_type->attributes ) ) { - $block_type->attributes['anchor'] = array( - 'type' => 'string', - ); - } -} - -/** - * Add the anchor to the output. - * - * @since 6.2.0 - * @access private - * - * @param WP_Block_Type $block_type Block Type. - * @param array $block_attributes Block attributes. - * @return array Block anchor. - */ -function wp_apply_anchor_support( $block_type, $block_attributes ) { - if ( ! $block_attributes ) { - return array(); - } - - if ( wp_should_skip_block_supports_serialization( $block_type, 'anchor' ) ) { - return array(); - } - - $has_anchor_support = _wp_array_get( $block_type->supports, array( 'anchor' ), true ); - if ( ! $has_anchor_support ) { - return array(); - } - - $has_anchor = array_key_exists( 'anchor', $block_attributes ); - if ( ! $has_anchor ) { - return array(); - } - - return array( 'id' => $block_attributes['anchor'] ); -} - -// Register the block support. -WP_Block_Supports::get_instance()->register( - 'anchor', - array( - 'register_attribute' => 'wp_register_anchor_support', - 'apply' => 'wp_apply_anchor_support', - ) -); diff --git a/wp-includes/version.php b/wp-includes/version.php index 46d7f7f364..31d25fd6e6 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.2-beta3-55442'; +$wp_version = '6.2-beta3-55443'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-settings.php b/wp-settings.php index a11b07ca28..3763dd825f 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -327,7 +327,6 @@ require ABSPATH . WPINC . '/block-patterns.php'; require ABSPATH . WPINC . '/class-wp-block-supports.php'; require ABSPATH . WPINC . '/block-supports/utils.php'; require ABSPATH . WPINC . '/block-supports/align.php'; -require ABSPATH . WPINC . '/block-supports/anchor.php'; require ABSPATH . WPINC . '/block-supports/border.php'; require ABSPATH . WPINC . '/block-supports/colors.php'; require ABSPATH . WPINC . '/block-supports/custom-classname.php';