Changeset 52135 for trunk/src/wp-includes/block-supports/layout.php

Timestamp:

11/11/2021 07:41:38 AM (3 years ago)

Author:

noisysocks

Message:

Update @wordpress packages

Update packages to include these bug fixes from Gutenberg:

• Group - Fix inner container regexes using fixed div tag
• Image block: Make sure the Image block border radius is inherited if the image is linked
• Navigation: Small fixes
• FSE: Add template_type guards
• Template Part Block: Add some guards
• Fix getEntityRecords to ensure resolution on REST API failure
• Ensure menus before map operation in Nav block
• Link editing: Account for link anchor no longer being present when generating unique link instance key
• Navigation: Hide post attributes meta box
• Fix failing tests and compatibility with 5.9.
• Fix missing <MainDashboardButton> slot fill in site editor
• Move WP_REST_Block_Navigation_Areas_Controller from Gutenberg to Core.
• Fix site editor reset styles in WP 5.9

See #54337.

File:

• trunk/src/wp-includes/block-supports/layout.php (modified) (2 diffs)

trunk/src/wp-includes/block-supports/layout.php

@@ -221 +221 @@
  */
 function wp_restore_group_inner_container( $block_content, $block ) {
-    $group_with_inner_container_regex = '/(^\s*<div\b[^>]*wp-block-group(\s|")[^>]*>)(\s*<div\b[^>]*wp-block-group__inner-container(\s|")[^>]*>)((.|\S|\s)*)/';
+    $tag_name                         = isset( $block['attrs']['tagName'] ) ? $block['attrs']['tagName'] : 'div';
+    $group_with_inner_container_regex = sprintf(
+        '/(^\s*<%1$s\b[^>]*wp-block-group(\s|")[^>]*>)(\s*<div\b[^>]*wp-block-group__inner-container(\s|")[^>]*>)((.|\S|\s)*)/',
+        preg_quote( $tag_name, '/' )
+    );
 
     if (
@@ -232 +236 @@
     }
 
-    $replace_regex   = '/(^\s*<div\b[^>]*wp-block-group[^>]*>)(.*)(<\/div>\s*$)/ms';
+    $replace_regex   = sprintf(
+        '/(^\s*<%1$s\b[^>]*wp-block-group[^>]*>)(.*)(<\/%1$s>\s*$)/ms',
+        preg_quote( $tag_name, '/' )
+    );
     $updated_content = preg_replace_callback(
         $replace_regex,