Skip to content

Commit 67cf588

Browse files
desrosjdesrosj
committed
Editor: Bump @wordpress packages for 5.9.5.
Package updates for bug fixes: * @wordpress/block-directory: 3.0.30 * @wordpress/block-library: 6.0.29 * @wordpress/customize-widgets: 2.0.30 * @wordpress/edit-post: 5.0.30 * @wordpress/edit-site: 3.0.30 * @wordpress/edit-widgets: 3.1.25 * @wordpress/widgets: 2.0.25 git-svn-id: https://develop.svn.wordpress.org/branches/5.9@54564 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 5a1c18b commit 67cf588

File tree

8 files changed

+57
-63
lines changed

8 files changed

+57
-63
lines changed

‎package-lock.json‎

Lines changed: 35 additions & 41 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,24 +82,24 @@
8282
"@wordpress/api-fetch": "5.2.7",
8383
"@wordpress/autop": "3.2.3",
8484
"@wordpress/blob": "3.2.2",
85-
"@wordpress/block-directory": "3.0.29",
85+
"@wordpress/block-directory": "3.0.30",
8686
"@wordpress/block-editor": "8.0.18",
87-
"@wordpress/block-library": "6.0.28",
87+
"@wordpress/block-library": "6.0.29",
8888
"@wordpress/block-serialization-default-parser": "4.2.3",
8989
"@wordpress/blocks": "11.1.5",
9090
"@wordpress/components": "19.2.3",
9191
"@wordpress/compose": "5.0.7",
9292
"@wordpress/core-data": "4.0.11",
93-
"@wordpress/customize-widgets": "2.0.29",
93+
"@wordpress/customize-widgets": "2.0.30",
9494
"@wordpress/data": "6.1.5",
9595
"@wordpress/data-controls": "2.2.9",
9696
"@wordpress/date": "4.2.3",
9797
"@wordpress/deprecated": "3.2.3",
9898
"@wordpress/dom": "3.2.7",
9999
"@wordpress/dom-ready": "3.2.3",
100-
"@wordpress/edit-post": "5.0.29",
101-
"@wordpress/edit-site": "3.0.29",
102-
"@wordpress/edit-widgets": "3.1.24",
100+
"@wordpress/edit-post": "5.0.30",
101+
"@wordpress/edit-site": "3.0.30",
102+
"@wordpress/edit-widgets": "3.1.25",
103103
"@wordpress/editor": "12.0.22",
104104
"@wordpress/element": "4.0.4",
105105
"@wordpress/escape-html": "2.2.3",
@@ -128,7 +128,7 @@
128128
"@wordpress/url": "3.3.2",
129129
"@wordpress/viewport": "4.0.7",
130130
"@wordpress/warning": "2.2.2",
131-
"@wordpress/widgets": "2.0.24",
131+
"@wordpress/widgets": "2.0.25",
132132
"@wordpress/wordcount": "3.2.3",
133133
"backbone": "1.4.0",
134134
"clipboard": "2.0.8",

‎src/wp-includes/blocks/legacy-widget.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function render_block_core_legacy_widget( $attributes ) {
4646

4747
if ( isset( $attributes['instance']['encoded'], $attributes['instance']['hash'] ) ) {
4848
$serialized_instance = base64_decode( $attributes['instance']['encoded'] );
49-
if ( wp_hash( $serialized_instance ) !== $attributes['instance']['hash'] ) {
49+
if ( ! hash_equals( wp_hash( $serialized_instance ), (string) $attributes['instance']['hash'] ) ) {
5050
return '';
5151
}
5252
$instance = unserialize( $serialized_instance );

‎src/wp-includes/blocks/navigation.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -549,13 +549,13 @@ function render_block_core_navigation( $attributes, $content, $block ) {
549549
</div>
550550
</div>
551551
</div>',
552-
$modal_unique_id,
552+
esc_attr( $modal_unique_id ),
553553
$inner_blocks_html,
554554
__( 'Open menu' ), // Open button label.
555555
__( 'Close menu' ), // Close button label.
556-
implode( ' ', $responsive_container_classes ),
557-
implode( ' ', $open_button_classes ),
558-
$colors['overlay_inline_styles'],
556+
esc_attr( implode( ' ', $responsive_container_classes ) ),
557+
esc_attr( implode( ' ', $open_button_classes ) ),
558+
esc_attr( safecss_filter_attr( $colors['overlay_inline_styles'] ) ),
559559
__( 'Menu' )
560560
);
561561

‎src/wp-includes/blocks/post-featured-image.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ function render_block_core_post_featured_image( $attributes, $content, $block )
4343
if ( ! empty( $attributes['scale'] ) ) {
4444
$image_styles .= "object-fit:{$attributes['scale']};";
4545
}
46-
$featured_image = str_replace( 'src=', "style='$image_styles' src=", $featured_image );
46+
$featured_image = str_replace( '<img ', '<img style="' . esc_attr( safecss_filter_attr( $image_styles ) ) . '" ', $featured_image );
4747
}
4848

4949
return "<figure $wrapper_attributes>$featured_image</figure>";

‎src/wp-includes/blocks/rss.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function render_block_core_rss( $attributes ) {
1616
$rss = fetch_feed( $attributes['feedURL'] );
1717

1818
if ( is_wp_error( $rss ) ) {
19-
return '<div class="components-placeholder"><div class="notice notice-error"><strong>' . __( 'RSS Error:' ) . '</strong> ' . $rss->get_error_message() . '</div></div>';
19+
return '<div class="components-placeholder"><div class="notice notice-error"><strong>' . __( 'RSS Error:' ) . '</strong> ' . esc_html( $rss->get_error_message() ) . '</div></div>';
2020
}
2121

2222
if ( ! $rss->get_item_quantity() ) {
@@ -44,8 +44,8 @@ function render_block_core_rss( $attributes ) {
4444
if ( $date ) {
4545
$date = sprintf(
4646
'<time datetime="%1$s" class="wp-block-rss__item-publish-date">%2$s</time> ',
47-
date_i18n( get_option( 'c' ), $date ),
48-
date_i18n( get_option( 'date_format' ), $date )
47+
esc_attr( date_i18n( get_option( 'c' ), $date ) ),
48+
esc_attr( date_i18n( get_option( 'date_format' ), $date ) )
4949
);
5050
}
5151
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -276,12 +276,12 @@ function styles_for_block_core_search( $attributes ) {
276276
// Add color styles.
277277
$has_text_color = ! empty( $attributes['style']['color']['text'] );
278278
if ( $has_text_color ) {
279-
$button_styles[] = sprintf( 'color: %s;', esc_attr( $attributes['style']['color']['text'] ) );
279+
$button_styles[] = sprintf( 'color: %s;', $attributes['style']['color']['text'] );
280280
}
281281

282282
$has_background_color = ! empty( $attributes['style']['color']['background'] );
283283
if ( $has_background_color ) {
284-
$button_styles[] = sprintf( 'background-color: %s;', esc_attr( $attributes['style']['color']['background'] ) );
284+
$button_styles[] = sprintf( 'background-color: %s;', $attributes['style']['color']['background'] );
285285
}
286286

287287
$has_custom_gradient = ! empty( $attributes['style']['color']['gradient'] );
@@ -290,9 +290,9 @@ function styles_for_block_core_search( $attributes ) {
290290
}
291291

292292
return array(
293-
'input' => ! empty( $input_styles ) ? sprintf( ' style="%s"', safecss_filter_attr( implode( ' ', $input_styles ) ) ) : '',
294-
'button' => ! empty( $button_styles ) ? sprintf( ' style="%s"', safecss_filter_attr( implode( ' ', $button_styles ) ) ) : '',
295-
'wrapper' => ! empty( $wrapper_styles ) ? sprintf( ' style="%s"', safecss_filter_attr( implode( ' ', $wrapper_styles ) ) ) : '',
293+
'input' => ! empty( $input_styles ) ? sprintf( ' style="%s"', esc_attr( safecss_filter_attr( implode( ' ', $input_styles ) ) ) ) : '',
294+
'button' => ! empty( $button_styles ) ? sprintf( ' style="%s"', esc_attr( safecss_filter_attr( implode( ' ', $button_styles ) ) ) ) : '',
295+
'wrapper' => ! empty( $wrapper_styles ) ? sprintf( ' style="%s"', esc_attr( safecss_filter_attr( implode( ' ', $wrapper_styles ) ) ) ) : '',
296296
);
297297
}
298298

‎src/wp-includes/blocks/widget-group.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function render_block_core_widget_group( $attributes, $content, $block ) {
2828
$html = '';
2929

3030
if ( ! empty( $attributes['title'] ) ) {
31-
$html .= $before_title . $attributes['title'] . $after_title;
31+
$html .= $before_title . esc_html( $attributes['title'] ) . $after_title;
3232
}
3333

3434
$html .= '<div class="wp-widget-group__inner-blocks">';

0 commit comments

Comments
 (0)