From f0ac29772070f03082be8667f6f2c940aec12603 Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Mon, 14 Jun 2021 23:44:58 +0000
Subject: [PATCH] Editor: Replace a Gutenberg specific function with the Core
 equivalent.

This replaces a stray instance of `gutenberg_experimental_set()` with the WordPress Core version of this function, `_wp_array_set()`.

A stray `gutenberg` text domain is also removed from a `__()` call.

Props walbo, chaion07, JeffPaul.
Fixes #53369.
Built from https://develop.svn.wordpress.org/trunk@51148


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

diff --git a/wp-includes/blocks.php b/wp-includes/blocks.php
index f5541e0ae9..4e90fde121 100644
--- a/wp-includes/blocks.php
+++ b/wp-includes/blocks.php
@@ -988,10 +988,10 @@ function wp_migrate_old_typography_shape( $metadata ) {
 		if ( null !== $support_for_key ) {
 			trigger_error(
 				/* translators: %1$s: Block type, %2$s: typography supports key e.g: fontSize, lineHeight etc... */
-				sprintf( __( 'Block %1$s is declaring %2$s support on block.json under supports.%2$s. %2$s support is now declared under supports.typography.%2$s.', 'gutenberg' ), $metadata['name'], $typography_key ),
+				sprintf( __( 'Block %1$s is declaring %2$s support on block.json under supports.%2$s. %2$s support is now declared under supports.typography.%2$s.' ), $metadata['name'], $typography_key ),
 				headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
 			);
-			gutenberg_experimental_set( $metadata['supports'], array( 'typography', $typography_key ), $support_for_key );
+			_wp_array_set( $metadata['supports'], array( 'typography', $typography_key ), $support_for_key );
 			unset( $metadata['supports'][ $typography_key ] );
 		}
 	}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index db5700367c..ed822d5ed0 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.8-beta1-51147';
+$wp_version = '5.8-beta1-51148';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.