Changeset 54483 for trunk/src/wp-includes/blocks/search.php

Timestamp:

10/11/2022 03:24:12 PM (4 years ago)

Author:

davidbaumwald

Message:

Editor: Update packages for 6.1 Release Candidate 1.

Package updates for bug and regression fixes:
@wordpress/block-directory: 3.15.6
@wordpress/block-editor: 10.0.6
@wordpress/block-library: 7.14.6
@wordpress/components: 21.0.5
@wordpress/customize-widgets: 3.14.6
@wordpress/edit-post: 6.14.6
@wordpress/edit-site: 4.14.8
@wordpress/edit-widgets: 4.14.6
@wordpress/editor: 12.16.6
@wordpress/format-library: 3.15.6
@wordpress/interface: 4.16.5
@wordpress/list-reusable-blocks: 3.15.5
@wordpress/nux: 5.15.5
@wordpress/preferences: 2.9.5
@wordpress/reusable-blocks: 3.15.6
@wordpress/server-side-render: 3.15.5
@wordpress/widgets: 2.15.6

References:

• ​Gutenberg PR 43181 - Merge inner blocks if wrappers are equal
• ​Gutenberg PR 44098 - Fix content blocks with nested blocks always appear as top level
• ​Gutenberg PR 44150 - Refresh selection styles
• ​Gutenberg PR 44415 - Removes __unstableMaxPages attribute from Page List and Nav blocks
• ​Gutenberg PR 44463 - Follow discussion settings in the comments block edit
• ​Gutenberg PR 44584 - Avoid querying block templates during installation
• ​Gutenberg PR 44637 - Resizable editor: Fix height setting bug
• ​Gutenberg PR 44640 - Only include theme.css if the theme declares support for wp-block-styles
• ​Gutenberg PR 44650 - Fix empty links being created for the author's name comment
• ​Gutenberg PR 44652 - Block Editor: Fix block search for non-Latin characters
• ​Gutenberg PR 44660 - Legacy Group inner block wrapper should work with constrained layout
• ​Gutenberg PR 44676 - Hide list items from content area of content locked blocks
• ​Gutenberg PR 44718 - Margin visualizer: Apply negative value to margins with calc()
• ​Gutenberg PR 44721 - Remove anchor support from the navigation block
• ​Gutenberg PR 44731 - Buttons: Add specificity for the editor

Follow-up to [54257], [54335], and [54383].

Props bernhard-reiter, czapla, annezazu, cbravobernal, ndiego, bjorsch, nendeb55.
See #56467.

File:

• trunk/src/wp-includes/blocks/search.php (modified) (2 diffs)

trunk/src/wp-includes/blocks/search.php

@@ -382 +382 @@
 
         // Get typography styles to be shared across inner elements.
-        $typography_styles = get_typography_styles_for_block_core_search( $attributes );
+        $typography_styles = esc_attr( get_typography_styles_for_block_core_search( $attributes ) );
         if ( ! empty( $typography_styles ) ) {
                 $label_styles [] = $typography_styles;
@@ -443 +443 @@
         // Add typography styles.
         if ( ! empty( $attributes['style']['typography']['fontSize'] ) ) {
-                $typography_styles[] = sprintf( 'font-size: %s;', esc_attr( $attributes['style']['typography']['fontSize'] ) );
+                $typography_styles[] = sprintf(
+                        'font-size: %s;',
+                        gutenberg_get_typography_font_size_value(
+                                array(
+                                        'size' => $attributes['style']['typography']['fontSize'],
+                                )
+                        )
+                );
+
         }
 
         if ( ! empty( $attributes['style']['typography']['fontFamily'] ) ) {
-                $typography_styles[] = sprintf( 'font-family: %s;', esc_attr( $attributes['style']['typography']['fontFamily'] ) );
+                $typography_styles[] = sprintf( 'font-family: %s;', $attributes['style']['typography']['fontFamily'] );
         }
 
         if ( ! empty( $attributes['style']['typography']['letterSpacing'] ) ) {
-                $typography_styles[] = sprintf( 'letter-spacing: %s;', esc_attr( $attributes['style']['typography']['letterSpacing'] ) );
+                $typography_styles[] = sprintf( 'letter-spacing: %s;', $attributes['style']['typography']['letterSpacing'] );
         }
 
         if ( ! empty( $attributes['style']['typography']['fontWeight'] ) ) {
-                $typography_styles[] = sprintf( 'font-weight: %s;', esc_attr( $attributes['style']['typography']['fontWeight'] ) );
+                $typography_styles[] = sprintf( 'font-weight: %s;', $attributes['style']['typography']['fontWeight'] );
         }
 
         if ( ! empty( $attributes['style']['typography']['fontStyle'] ) ) {
-                $typography_styles[] = sprintf( 'font-style: %s;', esc_attr( $attributes['style']['typography']['fontStyle'] ) );
+                $typography_styles[] = sprintf( 'font-style: %s;', $attributes['style']['typography']['fontStyle'] );
         }
 
         if ( ! empty( $attributes['style']['typography']['lineHeight'] ) ) {
-                $typography_styles[] = sprintf( 'line-height: %s;', esc_attr( $attributes['style']['typography']['lineHeight'] ) );
+                $typography_styles[] = sprintf( 'line-height: %s;', $attributes['style']['typography']['lineHeight'] );
         }
 
         if ( ! empty( $attributes['style']['typography']['textTransform'] ) ) {
-                $typography_styles[] = sprintf( 'text-transform: %s;', esc_attr( $attributes['style']['typography']['textTransform'] ) );
+                $typography_styles[] = sprintf( 'text-transform: %s;', $attributes['style']['typography']['textTransform'] );
         }