From d969240845a167223e21a3f6c819285bd00ff66b Mon Sep 17 00:00:00 2001
From: spacedmonkey <spacedmonkey@git.wordpress.org>
Date: Tue, 26 Sep 2023 12:28:22 +0000
Subject: [PATCH] Editor: Fix deprecation notice in block editor.

In [56682], the `print_emoji_styles` function was deprecated and a corresponding deprecation notice was added. In order to maintain backward compatibility, `print_emoji_styles` was retained as a hook into wp_print_styles. This resulted in the appearance of deprecation notices within the block editor. The root of this issue was the manual invocation of the `wp_print_styles` function in block-editor.php. To address this, the `print_emoji_styles` callback was manually removed, `wp_print_styles` was called, and the action was subsequently rehooked, resolving the deprecation notice within the block editor.

Props mamaduka, hellofromtonya, spacedmonkey.
See #58775.
Built from https://develop.svn.wordpress.org/trunk@56706


git-svn-id: http://core.svn.wordpress.org/trunk@56218 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/block-editor.php | 13 +++++++++++++
 wp-includes/version.php      |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/wp-includes/block-editor.php b/wp-includes/block-editor.php
index ba92c0ec3f..7b63490a8a 100644
--- a/wp-includes/block-editor.php
+++ b/wp-includes/block-editor.php
@@ -359,11 +359,24 @@ function _wp_get_iframed_editor_assets() {
 		}
 	}
 
+	/**
+	 * Remove the deprecated `print_emoji_styles` handler.
+	 * It avoids breaking style generation with a deprecation message.
+	 */
+	$has_emoji_styles = has_action( 'wp_print_styles', 'print_emoji_styles' );
+	if ( $has_emoji_styles ) {
+		remove_action( 'wp_print_styles', 'print_emoji_styles' );
+	}
+
 	ob_start();
 	wp_print_styles();
 	wp_print_font_faces();
 	$styles = ob_get_clean();
 
+	if ( $has_emoji_styles ) {
+		add_action( 'wp_print_styles', 'print_emoji_styles' );
+	}
+
 	ob_start();
 	wp_print_head_scripts();
 	wp_print_footer_scripts();
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9da69a1742..6d3cd2c712 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.4-alpha-56705';
+$wp_version = '6.4-alpha-56706';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.