resolve rebase conflict

WordPress · Sep 14, 2023 · 568ed22 · 568ed22
1 parent ae1fcc0
commit 568ed22
Showing 1 changed file with 5 additions and 5 deletions.
diff --git 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