Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
hellofromTonya 2023-09-07 17:30:17 +00:00
parent dedb9c6d5a
commit aaec843875
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/fonts.php
View File

@ -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 );
}

2
wp-includes/version.php
View File

@ -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.