WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
whyisjake 2020-05-27 19:28:12 +00:00
parent 38b7495af7
commit 552883574b
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/class-wp-editor.php
View File

@ -310,14 +310,10 @@ final class _WP_Editors {
/** /**
* @since 3.3.0 * @since 3.3.0
* *
* @global string $tinymce_version
*
* @param string $editor_id Unique editor identifier, e.g. 'content'. * @param string $editor_id Unique editor identifier, e.g. 'content'.
* @param array $set Array of editor arguments. * @param array $set Array of editor arguments.
*/ */
public static function editor_settings( $editor_id, $set ) { public static function editor_settings( $editor_id, $set ) {
global $tinymce_version;
if ( empty( self::$first_init ) ) { if ( empty( self::$first_init ) ) {
if ( is_admin() ) { if ( is_admin() ) {
add_action( 'admin_print_footer_scripts', array( __CLASS__, 'editor_js' ), 50 ); add_action( 'admin_print_footer_scripts', array( __CLASS__, 'editor_js' ), 50 );

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.