Changeset 57760 for trunk/src/wp-includes/blocks/block.php

Timestamp:

03/04/2024 02:06:57 PM (6 months ago)

Author:

youknowriad

Message:

Editor: Update Packages with the latest bug fixes for 6.5 RC 1

It includes all the backports from this Gutenberg PR ​https://github.com/WordPress/gutenberg/pull/59541/

Props get_dave, youknowriad, talldanwp.
See #60315.
Fixes #60665.

File:

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

trunk/src/wp-includes/blocks/block.php

@@ -47 +47 @@
     $content = $wp_embed->autoembed( $content );
 
-    // Back compat, the content attribute was previously named overrides and
-    // had a slightly different format. For blocks that have not been migrated,
-    // also convert the format here so that the provided `pattern/overrides`
-    // context is correct.
+    // Back compat.
+    // For blocks that have not been migrated in the editor, add some back compat
+    // so that front-end rendering continues to work.
+
+    // This matches the `v2` deprecation. Removes the inner `values` property
+    // from every item.
+    if ( isset( $attributes['content'] ) ) {
+        foreach ( $attributes['content'] as &$content_data ) {
+            if ( isset( $content_data['values'] ) ) {
+                $is_assoc_array = is_array( $content_data['values'] ) && ! wp_is_numeric_array( $content_data['values'] );
+
+                if ( $is_assoc_array ) {
+                    $content_data = $content_data['values'];
+                }
+            }
+        }
+    }
+
+    // This matches the `v1` deprecation. Rename `overrides` to `content`.
     if ( isset( $attributes['overrides'] ) && ! isset( $attributes['content'] ) ) {
-        $migrated_content = array();
-        foreach ( $attributes['overrides'] as $id => $values ) {
-            $migrated_content[ $id ] = array(
-                'values' => $values,
-            );
-        }
-        $attributes['content'] = $migrated_content;
+        $attributes['content'] = $attributes['overrides'];
     }
-    $has_pattern_overrides = isset( $attributes['content'] );
 
     /**
@@ -67 +75 @@
      * rendering via do_blocks given it only receives the inner content.
      */
+    $has_pattern_overrides = isset( $attributes['content'] );
     if ( $has_pattern_overrides ) {
         $filter_block_context = static function ( $context ) use ( $attributes ) {