Changeset 51167 for trunk/src/wp-includes/blocks.php

Timestamp:

06/15/2021 09:36:07 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Editor: Check if supports metadata key is defined before migrating typography keys.

This avoids an "Undefined index" PHP notice on blocks without a supports key in block.json.

Follow-up to [51089], [51153], [51159].

Props walbo.
Fixes #53416.

File:

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

trunk/src/wp-includes/blocks.php

@@ -987 +987 @@
  */
 function wp_migrate_old_typography_shape( $metadata ) {
+    if ( ! isset( $metadata['supports'] ) ) {
+        return $metadata;
+    }
+
     $typography_keys = array(
         '__experimentalFontFamily',
@@ -997 +1001 @@
         'lineHeight',
     );
+
     foreach ( $typography_keys as $typography_key ) {
         $support_for_key = _wp_array_get( $metadata['supports'], array( $typography_key ), null );
+
         if ( null !== $support_for_key ) {
             _doing_it_wrong(
@@ -1013 +1019 @@
                 '5.8.0'
             );
+
             _wp_array_set( $metadata['supports'], array( 'typography', $typography_key ), $support_for_key );
             unset( $metadata['supports'][ $typography_key ] );
         }
     }
+
     return $metadata;
 }