From 2ddc837e838c0d3549bcf132a9b43043c7c41991 Mon Sep 17 00:00:00 2001
From: audrasjb <audrasjb@git.wordpress.org>
Date: Tue, 11 Oct 2022 15:30:11 +0000
Subject: [PATCH] Editor: Reinstate old persistence system configuration for
 the block editor usage data.

In [54182], the configuration for the old preference persistence system was removed. This system is still used for block usage data (to show the most frequently used blocks in the inserter). Furthermore some plugins may use this persistence system.

This changeset reinstates the previous persistence system used by the "Most used blocks" feature in the block inserter.

Follow-up to [54182].

Props talldanwp.
Fixes #56778.

Built from https://develop.svn.wordpress.org/trunk@54485


git-svn-id: http://core.svn.wordpress.org/trunk@54044 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/script-loader.php | 16 ++++++++++++++++
 wp-includes/version.php       |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index f3014a241f..5d842f5787 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -383,6 +383,22 @@ function wp_default_packages_inline_scripts( $scripts ) {
 		)
 	);
 
+	// Backwards compatibility - configure the old wp-data persistence system.
+	$scripts->add_inline_script(
+		'wp-data',
+		implode(
+			"\n",
+			array(
+				'( function() {',
+				'	var userId = ' . get_current_user_ID() . ';',
+				'	var storageKey = "WP_DATA_USER_" + userId;',
+				'	wp.data',
+				'		.use( wp.data.plugins.persistence, { storageKey: storageKey } );',
+				'} )();',
+			)
+		)
+	);
+
 	// Calculate the timezone abbr (EDT, PST) if possible.
 	$timezone_string = get_option( 'timezone_string', 'UTC' );
 	$timezone_abbr   = '';
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 2ce330422e..7a6eca6bb3 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.1-beta3-54484';
+$wp_version = '6.1-beta3-54485';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.