' . $matches[2] . '
' . $matches[3];
},
$block_content
@@ -139,4 +272,65 @@
return $updated_content;
}
-add_filter( 'render_block', 'wp_restore_group_inner_container', 10, 2 );
+add_filter( 'render_block_core/group', 'wp_restore_group_inner_container', 10, 2 );
+
+/**
+ * For themes without theme.json file, make sure
+ * to restore the outer div for the aligned image block
+ * to avoid breaking styles relying on that div.
+ *
+ * @since 6.0.0
+ * @access private
+ *
+ * @param string $block_content Rendered block content.
+ * @param array $block Block object.
+ * @return string Filtered block content.
+ */
+function wp_restore_image_outer_container( $block_content, $block ) {
+ $image_with_align = "
+/# 1) everything up to the class attribute contents
+(
+ ^\s*
+ ]*
+ \bclass=
+ [\"']
+)
+# 2) the class attribute contents
+(
+ [^\"']*
+ \bwp-block-image\b
+ [^\"']*
+ \b(?:alignleft|alignright|aligncenter)\b
+ [^\"']*
+)
+# 3) everything after the class attribute contents
+(
+ [\"']
+ [^>]*
+ >
+ .*
+ <\/figure>
+)/iUx";
+
+ if (
+ WP_Theme_JSON_Resolver::theme_has_support() ||
+ 0 === preg_match( $image_with_align, $block_content, $matches )
+ ) {
+ return $block_content;
+ }
+
+ $wrapper_classnames = array( 'wp-block-image' );
+
+ // If the block has a classNames attribute these classnames need to be removed from the content and added back
+ // to the new wrapper div also.
+ if ( ! empty( $block['attrs']['className'] ) ) {
+ $wrapper_classnames = array_merge( $wrapper_classnames, explode( ' ', $block['attrs']['className'] ) );
+ }
+ $content_classnames = explode( ' ', $matches[2] );
+ $filtered_content_classnames = array_diff( $content_classnames, $wrapper_classnames );
+
+ return '' . $matches[1] . implode( ' ', $filtered_content_classnames ) . $matches[3] . '
';
+}
+
+add_filter( 'render_block_core/image', 'wp_restore_image_outer_container', 10, 2 );