From 33de1d77a5e6cec67eac6da2f3078d160e426b08 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Wed, 1 Mar 2023 15:03:23 +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.

git-svn-id: https://develop.svn.wordpress.org/trunk@55443 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/block-supports/anchor.php | 73 -----------------------
 src/wp-settings.php                       |  1 -
 2 files changed, 74 deletions(-)
 delete mode 100644 src/wp-includes/block-supports/anchor.php

diff --git a/src/wp-includes/block-supports/anchor.php b/src/wp-includes/block-supports/anchor.php
deleted file mode 100644
index e71cab0adf..0000000000
--- a/src/wp-includes/block-supports/anchor.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Anchor block support flag.
- *
- * @package WordPress
- * @since 6.2.0
- */
-
-/**
- * Registers the anchor block attribute for block types that support it.
- *
- * @since 6.2.0
- * @access private
- *
- * @param WP_Block_Type $block_type Block Type.
- */
-function wp_register_anchor_support( $block_type ) {
-	$has_anchor_support = _wp_array_get( $block_type->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/src/wp-settings.php b/src/wp-settings.php
index a11b07ca28..3763dd825f 100644
--- a/src/wp-settings.php
+++ b/src/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';