Changeset 56709 for trunk/src/wp-includes/block-supports/colors.php
- Timestamp:
- 09/26/2023 01:45:23 PM (3 years ago)
- File:
-
- 1 edited
-
trunk/src/wp-includes/block-supports/colors.php (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-includes/block-supports/colors.php
r56604 r56709 17 17 */ 18 18 function wp_register_colors_support( $block_type ) { 19 $color_support = property_exists( $block_type, 'supports' ) ? _wp_array_get( $block_type->supports, array( 'color' ), false ) : false; 20 $has_text_colors_support = true === $color_support || ( is_array( $color_support ) && _wp_array_get( $color_support, array( 'text' ), true ) ); 21 $has_background_colors_support = true === $color_support || ( is_array( $color_support ) && _wp_array_get( $color_support, array( 'background' ), true ) ); 22 $has_gradients_support = _wp_array_get( $color_support, array( 'gradients' ), false ); 23 $has_link_colors_support = _wp_array_get( $color_support, array( 'link' ), false ); 24 $has_button_colors_support = _wp_array_get( $color_support, array( 'button' ), false ); 25 $has_heading_colors_support = _wp_array_get( $color_support, array( 'heading' ), false ); 19 $color_support = false; 20 if ( property_exists( $block_type, 'supports' ) ) { 21 $color_support = isset( $block_type->supports['color'] ) ? $block_type->supports['color'] : false; 22 } 23 $has_text_colors_support = true === $color_support || 24 ( isset( $color_support['text'] ) && $color_support['text'] ) || 25 ( is_array( $color_support ) && ! isset( $color_support['text'] ) ); 26 $has_background_colors_support = true === $color_support || 27 ( isset( $color_support['background'] ) && $color_support['background'] ) || 28 ( is_array( $color_support ) && ! isset( $color_support['background'] ) ); 29 $has_gradients_support = isset( $color_support['gradients'] ) ? $color_support['gradients'] : false; 30 $has_link_colors_support = isset( $color_support['link'] ) ? $color_support['link'] : false; 31 $has_button_colors_support = isset( $color_support['button'] ) ? $color_support['button'] : false; 32 $has_heading_colors_support = isset( $color_support['heading'] ) ? $color_support['heading'] : false; 26 33 $has_color_support = $has_text_colors_support || 27 34 $has_background_colors_support || … … 75 82 */ 76 83 function wp_apply_colors_support( $block_type, $block_attributes ) { 77 $color_support = _wp_array_get( $block_type->supports, array( 'color' ), false );84 $color_support = isset( $block_type->supports['color'] ) ? $block_type->supports['color'] : false; 78 85 79 86 if ( … … 84 91 } 85 92 86 $has_text_colors_support = true === $color_support || ( is_array( $color_support ) && _wp_array_get( $color_support, array( 'text' ), true ) ); 87 $has_background_colors_support = true === $color_support || ( is_array( $color_support ) && _wp_array_get( $color_support, array( 'background' ), true ) ); 88 $has_gradients_support = _wp_array_get( $color_support, array( 'gradients' ), false ); 93 $has_text_colors_support = true === $color_support || 94 ( isset( $color_support['text'] ) && $color_support['text'] ) || 95 ( is_array( $color_support ) && ! isset( $color_support['text'] ) ); 96 $has_background_colors_support = true === $color_support || 97 ( isset( $color_support['background'] ) && $color_support['background'] ) || 98 ( is_array( $color_support ) && ! isset( $color_support['background'] ) ); 99 $has_gradients_support = isset( $color_support['gradients'] ) ? $color_support['gradients'] : false; 89 100 $color_block_styles = array(); 90 101 … … 92 103 if ( $has_text_colors_support && ! wp_should_skip_block_supports_serialization( $block_type, 'color', 'text' ) ) { 93 104 $preset_text_color = array_key_exists( 'textColor', $block_attributes ) ? "var:preset|color|{$block_attributes['textColor']}" : null; 94 $custom_text_color = _wp_array_get( $block_attributes, array( 'style', 'color', 'text' ), null );105 $custom_text_color = isset( $block_attributes['style']['color']['text'] ) ? $block_attributes['style']['color']['text'] : null; 95 106 $color_block_styles['text'] = $preset_text_color ? $preset_text_color : $custom_text_color; 96 107 } … … 99 110 if ( $has_background_colors_support && ! wp_should_skip_block_supports_serialization( $block_type, 'color', 'background' ) ) { 100 111 $preset_background_color = array_key_exists( 'backgroundColor', $block_attributes ) ? "var:preset|color|{$block_attributes['backgroundColor']}" : null; 101 $custom_background_color = _wp_array_get( $block_attributes, array( 'style', 'color', 'background' ), null );112 $custom_background_color = isset( $block_attributes['style']['color']['background'] ) ? $block_attributes['style']['color']['background'] : null; 102 113 $color_block_styles['background'] = $preset_background_color ? $preset_background_color : $custom_background_color; 103 114 } … … 106 117 if ( $has_gradients_support && ! wp_should_skip_block_supports_serialization( $block_type, 'color', 'gradients' ) ) { 107 118 $preset_gradient_color = array_key_exists( 'gradient', $block_attributes ) ? "var:preset|gradient|{$block_attributes['gradient']}" : null; 108 $custom_gradient_color = _wp_array_get( $block_attributes, array( 'style', 'color', 'gradient' ), null );119 $custom_gradient_color = isset( $block_attributes['style']['color']['gradient'] ) ? $block_attributes['style']['color']['gradient'] : null; 109 120 $color_block_styles['gradient'] = $preset_gradient_color ? $preset_gradient_color : $custom_gradient_color; 110 121 }
Note:
See TracChangeset
for help on using the changeset viewer.
![(please configure the [header_logo] section in trac.ini)](/chrome/site/your_project_logo.png)