Skip to content

Commit 17136e4

Browse files
committed
Try dedicated action
1 parent 8ba2807 commit 17136e4

File tree

2 files changed

+16
-23
lines changed

2 files changed

+16
-23
lines changed

src/wp-includes/block-editor.php

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,8 @@ function _wp_get_iframed_editor_assets() {
310310
$current_wp_script_modules = $wp_script_modules;
311311

312312
// Create new instances to collect the assets.
313-
$wp_styles = new WP_Styles();
314-
$wp_scripts = new WP_Scripts();
313+
$wp_styles = new WP_Styles();
314+
$wp_scripts = new WP_Scripts();
315315
$wp_script_modules = $wp_script_modules->clone_without_enqueued_modules();
316316

317317
/*
@@ -369,38 +369,25 @@ function _wp_get_iframed_editor_assets() {
369369
remove_action( 'wp_print_styles', 'print_emoji_styles' );
370370
}
371371

372+
add_action( 'wp_print_iframe_html', array( $wp_script_modules, 'print_import_map' ) );
373+
add_action( 'wp_print_iframe_html', array( $wp_script_modules, 'print_head_enqueued_script_modules' ) );
374+
add_action( 'wp_print_iframe_html', array( $wp_script_modules, 'print_enqueued_script_modules' ) );
375+
add_action( 'wp_print_iframe_html', array( $wp_script_modules, 'print_script_module_preloads' ) );
376+
372377
ob_start();
373-
wp_print_styles();
374-
wp_print_font_faces();
375-
wp_print_font_faces_from_style_variations();
376-
$styles = ob_get_clean();
378+
do_action( 'wp_print_iframe_html' );
379+
$html = ob_end_clean();
377380

378381
if ( $has_emoji_styles ) {
379382
add_action( 'wp_print_styles', 'print_emoji_styles' );
380383
}
381384

382-
ob_start();
383-
wp_print_head_scripts();
384-
wp_print_footer_scripts();
385-
$scripts = ob_get_clean();
386-
387-
ob_start();
388-
$wp_script_modules->print_import_map();
389-
$wp_script_modules->print_head_enqueued_script_modules();
390-
$wp_script_modules->print_enqueued_script_modules();
391-
$wp_script_modules->print_script_module_preloads();
392-
$script_modules = ob_get_clean();
393-
394385
// Restore the original instances.
395386
$wp_styles = $current_wp_styles;
396387
$wp_scripts = $current_wp_scripts;
397388
$wp_script_modules = $current_wp_script_modules;
398389

399-
return array(
400-
'styles' => $styles,
401-
'scripts' => $scripts,
402-
'script_modules' => $script_modules,
403-
);
390+
return array( 'html' => $html );
404391
}
405392

406393
/**

src/wp-includes/default-filters.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,12 @@
373373
add_action( 'wp_enqueue_scripts', 'wp_enqueue_emoji_styles' );
374374
add_action( 'wp_print_styles', 'print_emoji_styles' ); // Retained for backwards-compatibility. Unhooked by wp_enqueue_emoji_styles().
375375

376+
add_action( 'wp_print_iframe_html', 'wp_print_styles' );
377+
add_action( 'wp_print_iframe_html', 'wp_print_font_faces' );
378+
add_action( 'wp_print_iframe_html', 'wp_print_font_faces_from_style_variations' );
379+
add_action( 'wp_print_iframe_html', 'wp_print_head_scripts' );
380+
add_action( 'wp_print_iframe_html', 'wp_print_footer_scripts' );
381+
376382
if (
377383
// Comment reply link.
378384
isset( $_GET['replytocom'] )

0 commit comments

Comments
 (0)