diff --git a/src/wp-admin/edit-form-blocks.php b/src/wp-admin/edit-form-blocks.php index 2237fc69ce293..c677a2182370a 100644 --- a/src/wp-admin/edit-form-blocks.php +++ b/src/wp-admin/edit-form-blocks.php @@ -39,7 +39,7 @@ static function ( $classes ) { /* * Emoji replacement is disabled for now, until it plays nicely with React. */ -remove_action( 'admin_print_scripts', 'print_emoji_detection_script' ); +remove_action( 'admin_print_footer_scripts', 'print_emoji_detection_script' ); /* * Block editor implements its own Options menu for toggling Document Panels. diff --git a/src/wp-admin/includes/admin-filters.php b/src/wp-admin/includes/admin-filters.php index 5337cc02c88c9..2fe6f34034d0d 100644 --- a/src/wp-admin/includes/admin-filters.php +++ b/src/wp-admin/includes/admin-filters.php @@ -56,7 +56,7 @@ add_action( 'admin_print_styles', 'wp_resource_hints', 1 ); } -add_action( 'admin_print_scripts', 'print_emoji_detection_script' ); +add_action( 'admin_print_footer_scripts', 'print_emoji_detection_script' ); add_action( 'admin_print_scripts', 'print_head_scripts', 20 ); add_action( 'admin_print_footer_scripts', '_wp_footer_scripts' ); add_action( 'admin_enqueue_scripts', 'wp_enqueue_emoji_styles' ); diff --git a/tests/phpunit/tests/formatting/emoji.php b/tests/phpunit/tests/formatting/emoji.php index f16a51cb8b62c..aa9c54202048a 100644 --- a/tests/phpunit/tests/formatting/emoji.php +++ b/tests/phpunit/tests/formatting/emoji.php @@ -216,4 +216,28 @@ public function data_wp_staticize_emoji() { public function test_wp_staticize_emoji( $emoji, $expected ) { $this->assertSame( $expected, wp_staticize_emoji( $emoji ) ); } + + /** + * The emoji detection script outputs a `