--- a/wp/wp-includes/blocks/archives.php	Tue Dec 15 15:52:01 2020 +0100
+++ b/wp/wp-includes/blocks/archives.php	Wed Sep 21 18:19:35 2022 +0200
@@ -17,15 +17,7 @@
 function render_block_core_archives( $attributes ) {
 	$show_post_count = ! empty( $attributes['showPostCounts'] );
 
-	$class = 'wp-block-archives';
-
-	if ( isset( $attributes['align'] ) ) {
-		$class .= " align{$attributes['align']}";
-	}
-
-	if ( isset( $attributes['className'] ) ) {
-		$class .= " {$attributes['className']}";
-	}
+	$class = '';
 
 	if ( ! empty( $attributes['displayAsDropdown'] ) ) {
 
@@ -66,7 +58,7 @@
 				break;
 		}
 
-		$label = esc_attr( $label );
+		$label = esc_html( $label );
 
 		$block_content = '<label class="screen-reader-text" for="' . $dropdown_id . '">' . $title . '</label>
 	<select id="' . $dropdown_id . '" name="archive-dropdown" onchange="document.location.href=this.options[this.selectedIndex].value;">
@@ -96,18 +88,19 @@
 
 	$classnames = esc_attr( $class );
 
+	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classnames ) );
+
 	if ( empty( $archives ) ) {
-
 		return sprintf(
-			'<div class="%1$s">%2$s</div>',
-			$classnames,
+			'<div %1$s>%2$s</div>',
+			$wrapper_attributes,
 			__( 'No archives to show.' )
 		);
 	}
 
 	return sprintf(
-		'<ul class="%1$s">%2$s</ul>',
-		$classnames,
+		'<ul %1$s>%2$s</ul>',
+		$wrapper_attributes,
 		$archives
 	);
 }