WordPress · vcanales · Aug 14, 2023 · Aug 16, 2023 · Aug 16, 2023 · Aug 16, 2023
diff --git a/lib/experimental/fonts/font-library/font-library.php b/lib/experimental/fonts/font-library/font-library.php
@@ -55,3 +55,11 @@ function wp_register_font_collection( $config ) {
 		return WP_Font_Library::register_font_collection( $config );
 	}
 }
+
+// @core-merge: This code needs to be removed.
+add_action(
+	'enqueue_block_editor_assets',
+	function () {
+		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalFontLibrary = true', 'before' );
+	}
+);
diff --git a/lib/load.php b/lib/load.php
@@ -132,8 +132,7 @@ function gutenberg_is_experiment_enabled( $name ) {
  * keeping Fonts API available for sites that are using it.
  */
 if (
-	( defined( 'FONT_LIBRARY_ENABLE' ) && FONT_LIBRARY_ENABLE ) ||
-	( defined( 'FONTS_LIBRARY_ENABLE' ) && FONTS_LIBRARY_ENABLE )
+	! defined( 'FONT_LIBRARY_DISABLED' ) || ! FONT_LIBRARY_DISABLED
 ) {
 	// Loads the Font Library.
 	if ( ! class_exists( 'WP_Font_Library' ) ) {

diff --git a/package-lock.json b/package-lock.json