Fix content loss for group block

WordPress · Apr 1, 2021 · 69bfcee · 69bfcee
1 parent a59d42d
commit 69bfcee
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/lib/block-supports/layout.php b/lib/block-supports/layout.php
@@ -119,7 +119,7 @@ function gutenberg_render_layout_support_flag( $block_content, $block ) {
  * @return string                Filtered block content.
  */
 function gutenberg_restore_group_inner_container( $block_content, $block ) {
-	$group_with_inner_container_regex = '/(^(\s|\S)*<div\b[^>]*wp-block-group(\s|")[^>]*>)(([\s]|\S)*<div\b[^>]*wp-block-group__inner-container(\s|")[^>]*>)((.|\S|\s)*)/';
+	$group_with_inner_container_regex = '/(^\s*<div\b[^>]*wp-block-group(\s|")[^>]*>)(\s*<div\b[^>]*wp-block-group__inner-container(\s|")[^>]*>)((.|\S|\s)*)/';
 
 	if (
 		'core/group' !== $block['blockName'] ||
@@ -129,15 +129,14 @@ function gutenberg_restore_group_inner_container( $block_content, $block ) {
 		return $block_content;
 	}
 
-	$replace_regex   = '/(^(\s|\S)*<div\b[^>]*wp-block-group[^>]*>)((.|\S|\s)*)(<\/div>(\s|\S)*$)/m';
+	$replace_regex   = '/(^\s*<div\b[^>]*wp-block-group[^>]*>)(.*)(<\/div>\s*$)/s';
 	$updated_content = preg_replace_callback(
 		$replace_regex,
 		function( $matches ) {
-			return $matches[1] . '<div class="wp-block-group__inner-container">' . $matches[3] . '</div>' . $matches[5];
+			return $matches[1] . '<div class="wp-block-group__inner-container">' . $matches[2] . '</div>' . $matches[3];
 		},
 		$block_content
 	);
-
 	return $updated_content;
 }