From dd2cc423ef5801ba466cb120c73f591c66ea527c Mon Sep 17 00:00:00 2001
From: davidbaumwald <davidbaumwald@git.wordpress.org>
Date: Tue, 11 Oct 2022 15:41:13 +0000
Subject: [PATCH] Editor: Remove extra line break in
 `build_template_part_block_instance_variations()`.

This extra break was causing a QUnit failure check validating version controlled file contents.

Follow-up to [54483].

See #56467.
Built from https://develop.svn.wordpress.org/trunk@54487


git-svn-id: http://core.svn.wordpress.org/trunk@54046 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/blocks/navigation-link.php    | 2 +-
 wp-includes/blocks/navigation-submenu.php | 2 +-
 wp-includes/blocks/page-list.php          | 2 +-
 wp-includes/blocks/search.php             | 2 +-
 wp-includes/version.php                   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wp-includes/blocks/navigation-link.php b/wp-includes/blocks/navigation-link.php
index f32437b41a..ba8f547b32 100644
--- a/wp-includes/blocks/navigation-link.php
+++ b/wp-includes/blocks/navigation-link.php
@@ -100,7 +100,7 @@ function block_core_navigation_link_build_css_font_sizes( $context ) {
 		// Add the custom font size inline style.
 		$font_sizes['inline_styles'] = sprintf(
 			'font-size: %s;',
-			wp_get_typography_font_size_value(
+			gutenberg_get_typography_font_size_value(
 				array(
 					'size' => $context['style']['typography']['fontSize'],
 				)
diff --git a/wp-includes/blocks/navigation-submenu.php b/wp-includes/blocks/navigation-submenu.php
index 0ad7ba1d65..40cfae52f1 100644
--- a/wp-includes/blocks/navigation-submenu.php
+++ b/wp-includes/blocks/navigation-submenu.php
@@ -100,7 +100,7 @@ function block_core_navigation_submenu_build_css_font_sizes( $context ) {
 		// Add the custom font size inline style.
 		$font_sizes['inline_styles'] = sprintf(
 			'font-size: %s;',
-			wp_get_typography_font_size_value(
+			gutenberg_get_typography_font_size_value(
 				array(
 					'size' => $context['style']['typography']['fontSize'],
 				)
diff --git a/wp-includes/blocks/page-list.php b/wp-includes/blocks/page-list.php
index 5ef169fe13..9c7602fc40 100644
--- a/wp-includes/blocks/page-list.php
+++ b/wp-includes/blocks/page-list.php
@@ -121,7 +121,7 @@ function block_core_page_list_build_css_font_sizes( $context ) {
 		// Add the custom font size inline style.
 		$font_sizes['inline_styles'] = sprintf(
 			'font-size: %s;',
-			wp_get_typography_font_size_value(
+			gutenberg_get_typography_font_size_value(
 				array(
 					'size' => $context['style']['typography']['fontSize'],
 				)
diff --git a/wp-includes/blocks/search.php b/wp-includes/blocks/search.php
index 61b2cf2b06..851131a5fb 100644
--- a/wp-includes/blocks/search.php
+++ b/wp-includes/blocks/search.php
@@ -444,7 +444,7 @@ function get_typography_styles_for_block_core_search( $attributes ) {
 	if ( ! empty( $attributes['style']['typography']['fontSize'] ) ) {
 		$typography_styles[] = sprintf(
 			'font-size: %s;',
-			wp_get_typography_font_size_value(
+			gutenberg_get_typography_font_size_value(
 				array(
 					'size' => $attributes['style']['typography']['fontSize'],
 				)
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b1abf994fb..78acd1a287 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.1-beta3-54486';
+$wp_version = '6.1-beta3-54487';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.