Escape output and remove dupe import after rebase

WordPress · May 24, 2022 · ae6b7cd · ae6b7cd
1 parent a30b6d2
commit ae6b7cd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/lib/compat/wordpress-6.1/script-loader.php b/lib/compat/wordpress-6.1/script-loader.php
@@ -30,7 +30,7 @@ function gutenberg_enqueue_block_support_styles( $style, $priority = 10 ) {
 	add_action(
 		$action_hook_name,
 		static function () use ( $style ) {
-			echo "<style>$style</style>\n";
+			echo '<style>' . esc_html( $style ) . "</style>\n";
 		},
 		$priority
 	);

diff --git a/lib/load.php b/lib/load.php
@@ -126,7 +126,6 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/compat/wordpress-6.1/get-global-styles-and-settings.php';
 require __DIR__ . '/compat/wordpress-6.1/script-loader.php';
 require __DIR__ . '/compat/wordpress-6.1/class-wp-theme-json-6-1.php';
-require __DIR__ . '/compat/wordpress-6.1/script-loader.php';
 
 // Experimental features.
 remove_action( 'plugins_loaded', '_wp_theme_json_webfonts_handler' ); // Turns off WP 6.0's stopgap handler for Webfonts API.