From 03bbf916a96869629a1978a448e8a52a32cef5fa Mon Sep 17 00:00:00 2001
From: Andrew Ozz <admin@laptoptips.ca>
Date: Wed, 8 Sep 2021 19:16:02 +0000
Subject: [PATCH] Editor: fix the replacement of `wp.editor` with
 `wp.oldEditor` in the inline script outputted when enqueueing the old editor.

Props fullofcaffeine, davidbinda, grantmkin, get_dave, azaozz.
Fixes #53762.
Built from https://develop.svn.wordpress.org/trunk@51748


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

diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php
index 9ec353c907..5387d850d5 100644
--- a/wp-includes/class-wp-editor.php
+++ b/wp-includes/class-wp-editor.php
@@ -969,8 +969,12 @@ final class _WP_Editors {
 		?>
 		<script type="text/javascript">
 		window.wp = window.wp || {};
-		window.wp.editor = window.wp.oldEditor = window.wp.oldEditor || {};
-		window.wp.oldEditor.getDefaultSettings = function() {
+		window.wp.editor = window.wp.editor || {};
+		window.wp.oldEditor = window.wp.oldEditor || {};
+
+		// Add getDefaultSettings() to both wp.editor and wp.oldEditor for back compat.
+		// Use of wp.editor for "old editor" functionality should be deprecated.
+		window.wp.editor.getDefaultSettings = window.wp.oldEditor.getDefaultSettings = function() {
 			return {
 				tinymce: <?php echo $settings; ?>,
 				quicktags: {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4bd3d8fdbb..8cd901fcb0 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.9-alpha-51740';
+$wp_version = '5.9-alpha-51748';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.