Changeset 54498

Timestamp:

10/11/2022 06:43:52 PM (2 years ago)

Author:

hellofromTonya

Message:

Editor: Fix PHP notice in WP_Block_Supports when no attributes declared.

A check is added to verify if the block's 'attrs' key exists before accessing it. If no, it defaults to an empty array.

How was this found?
WP 6.1 removed the attributes from the core/page-list block. When this block is being processed by WP_Block_Supports::apply_block_supports(), the key 'attrs' does not exist in self::$block_to_render.

This commit includes a tiny micro-optimization by moving this line of code after the existing guard clause. Why? If the guard clause is triggered, the method bails out early, meaning the attributes code is not used. By moving it after the guard clause, it saves a tiny bit of memory and processing if this happens.

Follow-up to [49310], [54399].

Props petitphp, spacedmonkey, hellofromTonya.
Fixes #56799.

File:

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

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

@@ -95 +95 @@
      */
     public function apply_block_supports() {
-        $block_attributes = self::$block_to_render['attrs'];
-        $block_type       = WP_Block_Type_Registry::get_instance()->get_registered(
+        $block_type = WP_Block_Type_Registry::get_instance()->get_registered(
             self::$block_to_render['blockName']
         );
@@ -104 +103 @@
             return array();
         }
+
+        $block_attributes = array_key_exists( 'attrs', self::$block_to_render )
+            ? self::$block_to_render['attrs']
+            : array();
 
         $output = array();