Changeset 55541

Timestamp:

03/13/2023 04:30:09 PM (4 years ago)

Author:

spacedmonkey

Message:

Editor: Move variables to where used in wp_render_layout_support_flag.

Improves the performance of wp_render_layout_support_flag() function by moving variables to where each is used.
If a return happens before the variable is needed, this change avoids unnecessary processing and memory.

Props spacedmonkey, hellofromTonya, mukesh27.
Fixes #57815.

File:

• trunk/src/wp-includes/block-supports/layout.php (modified) (4 diffs)

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

@@ -320 +320 @@
  */
 function wp_render_layout_support_flag( $block_content, $block ) {
-        $block_type     = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
-        $support_layout = block_has_support( $block_type, array( '__experimentalLayout' ), false );
+        $block_type       = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
+        $support_layout   = block_has_support( $block_type, array( '__experimentalLayout' ), false );
         $has_child_layout = isset( $block['attrs']['style']['layout']['selfStretch'] );
 
@@ -370 +370 @@
         }
 
-        $global_settings               = wp_get_global_settings();
-        $block_gap                     = _wp_array_get( $global_settings, array( 'spacing', 'blockGap' ), null );
-        $has_block_gap_support         = isset( $block_gap );
-        $global_layout_settings        = _wp_array_get( $global_settings, array( 'layout' ), null );
-        $root_padding_aware_alignments = _wp_array_get( $global_settings, array( 'useRootPaddingAwareAlignments' ), false );
-
-        $default_block_layout = _wp_array_get( $block_type->supports, array( '__experimentalLayout', 'default' ), array() );
-        $used_layout          = isset( $block['attrs']['layout'] ) ? $block['attrs']['layout'] : $default_block_layout;
+        $global_settings        = wp_get_global_settings();
+        $global_layout_settings = _wp_array_get( $global_settings, array( 'layout' ), null );
+        $used_layout            = isset( $block['attrs']['layout'] ) ? $block['attrs']['layout'] : _wp_array_get( $block_type->supports, array( '__experimentalLayout', 'default' ), array() );
 
         if ( isset( $used_layout['inherit'] ) && $used_layout['inherit'] && ! $global_layout_settings ) {
@@ -392 +387 @@
                 $used_layout['type'] = 'constrained';
         }
+
+        $root_padding_aware_alignments = _wp_array_get( $global_settings, array( 'useRootPaddingAwareAlignments' ), false );
 
         if (
@@ -458 +455 @@
                  */
                 $should_skip_gap_serialization = wp_should_skip_block_supports_serialization( $block_type, 'spacing', 'blockGap' );
+
+                $block_gap             = _wp_array_get( $global_settings, array( 'spacing', 'blockGap' ), null );
+                $has_block_gap_support = isset( $block_gap );
 
                 $style = wp_get_layout_style(