From aaec8438758c4e0c39a623ed115c7719711734ef Mon Sep 17 00:00:00 2001
From: hellofromTonya <hellofromTonya@git.wordpress.org>
Date: Thu, 7 Sep 2023 17:30:17 +0000
Subject: [PATCH] Fonts: Removes static instance in wp_print_font_faces().

The static instance of `WP_Font_Face` is not needed. It was an unnecessary carryover from the experimental Fonts API (which was not introduced into Core).

Whereas the Fonts API needed to persist its data (i.e. to maintain the registered and enqueued fonts throughout the web request), Font Face does not have data to persist.

Font Face processes the fonts it receives when `WP_Font_Face::generate_and_print( $fonts )` is invoked. Thus, a singleton is not needed.

Removing the static reduces the amount of the code in the function and eliminates running its tests in separate processes to ensure a different instance is always used.

References:
* [https://github.com/WordPress/gutenberg/pull/54228 Gutenberg PR 54228].

Follow-up to [56500].

Props hellofromTonya, costdev.
Fixes #59165.
Built from https://develop.svn.wordpress.org/trunk@56540


git-svn-id: http://core.svn.wordpress.org/trunk@56052 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/fonts.php   | 6 +-----
 wp-includes/version.php | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/wp-includes/fonts.php b/wp-includes/fonts.php
index b628db18cf..306364bdc8 100644
--- a/wp-includes/fonts.php
+++ b/wp-includes/fonts.php
@@ -39,7 +39,6 @@
  * }
  */
 function wp_print_font_faces( $fonts = array() ) {
-	static $wp_font_face = null;
 
 	if ( empty( $fonts ) ) {
 		$fonts = WP_Font_Face_Resolver::get_fonts_from_theme_json();
@@ -49,9 +48,6 @@ function wp_print_font_faces( $fonts = array() ) {
 		return;
 	}
 
-	if ( null === $wp_font_face ) {
-		$wp_font_face = new WP_Font_Face();
-	}
-
+	$wp_font_face = new WP_Font_Face();
 	$wp_font_face->generate_and_print( $fonts );
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 372183a7e8..82ab1e859e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.4-alpha-56538';
+$wp_version = '6.4-alpha-56540';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.