From 568ed22a14391fd77f7916cbd88860dc1b13e60d Mon Sep 17 00:00:00 2001 From: Ari Stathopoulos Date: Thu, 14 Sep 2023 11:14:51 +0300 Subject: [PATCH] resolve rebase conflict --- lib/block-supports/border.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/block-supports/border.php b/lib/block-supports/border.php index 60b3f11590445..1a54371d082e1 100644 --- a/lib/block-supports/border.php +++ b/lib/block-supports/border.php @@ -142,11 +142,11 @@ function gutenberg_apply_border_support( $block_type, $block_attributes ) { */ function gutenberg_has_border_feature_support( $block_type, $feature, $default_value = false ) { // Check if all border support features have been opted into via `"__experimentalBorder": true`. - if ( - property_exists( $block_type, 'supports' ) && - ( true === _wp_array_get( $block_type->supports, array( '__experimentalBorder' ), $default_value ) ) - ) { - return true; + if ( property_exists( $block_type, 'supports' ) ) { + $block_type_supports_border = $block_type->supports['__experimentalBorder'] ?? $default_value; + if ( true === $block_type_supports_border ) { + return true; + } } // Check if the specific feature has been opted into individually