Set $handles to true

WordPress · May 2, 2023 · cf9942a · cf9942a
1 parent db8368d
commit cf9942a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/lib/compat/wordpress-6.2/script-loader.php b/lib/compat/wordpress-6.2/script-loader.php
@@ -132,7 +132,7 @@ function gutenberg_resolve_assets_override() {
 	// Generate font @font-face styles.
 	if ( function_exists( 'wp_print_fonts' ) ) {
 		ob_start();
-		wp_print_fonts( false, true );
+		wp_print_fonts( true );
 		$styles .= ob_get_clean();
 	}
 

diff --git a/lib/compat/wordpress-6.3/script-loader.php b/lib/compat/wordpress-6.3/script-loader.php
@@ -56,7 +56,7 @@ function _gutenberg_get_iframed_editor_assets() {
 
 	ob_start();
 	wp_print_styles();
-	wp_print_fonts( false, true );
+	wp_print_fonts( true );
 	$styles = ob_get_clean();
 
 	ob_start();

diff --git a/lib/experimental/fonts-api/fonts-api.php b/lib/experimental/fonts-api/fonts-api.php
@@ -176,15 +176,14 @@ function wp_register_font_provider( $name, $classname ) {
 	 *
 	 * @since X.X.X
 	 *
-	 * @param string|string[]|false $handles            Optional. Items to be processed: queue (false),
-	 *                                                  single item (string), or multiple items (array of strings).
-	 *                                                  Default false.
-	 * @param bool                  $for_iframed_editor Optional. Whether the fonts are for iframed editor.
-	 *                                                  Default false.
+	 * @param string|string[]|bool $handles Optional. Items to be processed: queue (false),
+	 *                                      for iframed editor assets (true), single item (string),
+	 *                                      or multiple items (array of strings).
+	 *                                      Default false.
 	 * @return array|string[] Array of font handles that have been processed.
 	 *                        An empty array if none were processed.
 	 */
-	function wp_print_fonts( $handles = false, $for_iframed_editor = false ) {
+	function wp_print_fonts( $handles = false ) {
 		global $wp_fonts;
 
 		if ( empty( $handles ) ) {
@@ -207,7 +206,7 @@ function wp_print_fonts( $handles = false, $for_iframed_editor = false ) {
 		}
 
 		// Print all registered fonts for the iframed editor.
-		if ( $for_iframed_editor ) {
+		if ( true === $handles ) {
 			$handles = $registered;
 		}
 

diff --git a/phpunit/fonts-api/wpPrintFonts-test.php b/phpunit/fonts-api/wpPrintFonts-test.php
@@ -135,7 +135,7 @@ public function test_should_print_all_registered_fonts_for_iframed_editor( $font
 		wp_register_fonts( $fonts );
 
 		$this->expectOutputString( $expected['output'] );
-		$actual_done = wp_print_fonts( false, true );
+		$actual_done = wp_print_fonts( true );
 		$this->assertSameSets( $expected['done'], $actual_done, 'All registered font-family handles should be returned' );
 	}