Changeset 56674

Timestamp:

09/25/2023 09:12:08 AM (16 months ago)

Author:

Bernhard Reiter

Message:

Blocks: Remove inject_hooked_block_markup filter.

Per discussion in #59424, there's agreement that the new hooked_block_types filter (introduced in [56673]) covers conditional addition and removal of hooked blocks better and at a higher level than the inject_hooked_block_markup filter that was originally added in [56649] for that same purpose.
Consequently, this changeset removes the latter filter.

Props gziolo.
Fixes #59439.

File:

• trunk/src/wp-includes/blocks.php (modified) (4 diffs)

trunk/src/wp-includes/blocks.php

@@ -819 +819 @@
             $hooked_block_types = apply_filters( 'hooked_block_types', $hooked_block_types, $relative_position, $anchor_block_type, $context );
             foreach ( $hooked_block_types as $hooked_block_type ) {
-                $hooked_block_markup = get_comment_delimited_block_content( $hooked_block_type, array(), '' );
-                /** This filter is documented in wp-includes/blocks.php */
-                $markup .= apply_filters( 'inject_hooked_block_markup', $hooked_block_markup, $hooked_block_type, $relative_position, $parent, $context );
+                $markup .= get_comment_delimited_block_content( $hooked_block_type, array(), '' );
             }
         }
@@ -831 +829 @@
         $hooked_block_types = apply_filters( 'hooked_block_types', $hooked_block_types, $relative_position, $anchor_block_type, $context );
         foreach ( $hooked_block_types as $hooked_block_type ) {
-            $hooked_block_markup = get_comment_delimited_block_content( $hooked_block_type, array(), '' );
-            /**
-             * Filters the serialized markup of a hooked block.
-             *
-             * @since 6.4.0
-             *
-             * @param string                  $hooked_block_markup The serialized markup of the hooked block.
-             * @param string                  $hooked_block_type   The type of the hooked block.
-             * @param string                  $relative_position   The relative position of the hooked block.
-             *                                                     Can be one of 'before', 'after', 'first_child', or 'last_child'.
-             * @param array                   $block               The anchor block.
-             * @param WP_Block_Template|array $context             The block template, template part, or pattern that the anchor block belongs to.
-             */
-            $markup .= apply_filters( 'inject_hooked_block_markup', $hooked_block_markup, $hooked_block_type, $relative_position, $block, $context );
+            $markup .= get_comment_delimited_block_content( $hooked_block_type, array(), '' );
         }
 
@@ -886 +871 @@
         $hooked_block_types = apply_filters( 'hooked_block_types', $hooked_block_types, $relative_position, $anchor_block_type, $context );
         foreach ( $hooked_block_types as $hooked_block_type ) {
-            $hooked_block_markup = get_comment_delimited_block_content( $hooked_block_type, array(), '' );
-            /** This filter is documented in wp-includes/blocks.php */
-            $markup .= apply_filters( 'inject_hooked_block_markup', $hooked_block_markup, $hooked_block_type, $relative_position, $block, $context );
+            $markup .= get_comment_delimited_block_content( $hooked_block_type, array(), '' );
         }
 
@@ -899 +882 @@
             $hooked_block_types = apply_filters( 'hooked_block_types', $hooked_block_types, $relative_position, $anchor_block_type, $context );
             foreach ( $hooked_block_types as $hooked_block_type ) {
-                $hooked_block_markup = get_comment_delimited_block_content( $hooked_block_type, array(), '' );
-                /** This filter is documented in wp-includes/blocks.php */
-                $markup .= apply_filters( 'inject_hooked_block_markup', $hooked_block_markup, $hooked_block_type, $relative_position, $parent, $context );
+                $markup .= get_comment_delimited_block_content( $hooked_block_type, array(), '' );
             }
         }