From 552883574b0c971b13c10d99db7dbbcbff6ed427 Mon Sep 17 00:00:00 2001
From: whyisjake <whyisjake@git.wordpress.org>
Date: Wed, 27 May 2020 19:28:12 +0000
Subject: [PATCH] Editor: Remove TinyMCE global version.

The global variable is not being used in the `editor_settings` method.

Fixes #45398.
Props ishitaka, noisysocks, mista-flo.


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


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

diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php
index 3ed8ffdcb0..887b899b79 100644
--- a/wp-includes/class-wp-editor.php
+++ b/wp-includes/class-wp-editor.php
@@ -310,14 +310,10 @@ final class _WP_Editors {
 	/**
 	 * @since 3.3.0
 	 *
-	 * @global string $tinymce_version
-	 *
 	 * @param string $editor_id Unique editor identifier, e.g. 'content'.
 	 * @param array  $set       Array of editor arguments.
 	 */
 	public static function editor_settings( $editor_id, $set ) {
-		global $tinymce_version;
-
 		if ( empty( self::$first_init ) ) {
 			if ( is_admin() ) {
 				add_action( 'admin_print_footer_scripts', array( __CLASS__, 'editor_js' ), 50 );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d5b105547e..572a0467ad 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-alpha-47859';
+$wp_version = '5.5-alpha-47860';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.