Script loading: Fix regression after [43738].
After [43738], TinyMCE would be loaded earlier than before, which makes filters run at a different time relative to the loading of TinyMCE. Fix this by calling `wp_print_scripts` at the location where TinyMCE would previously be inserted as a `<script>` tag in the page. Also, an TinyMCE translation related `<script>` that was mistakenly removed in [44115]. Props azaozz, omarreiss, swisspidy, atimmer. Merges [43753], [43754] to trunk. Fixes #45065. Built from https://develop.svn.wordpress.org/trunk@44119 git-svn-id: http://core.svn.wordpress.org/trunk@43949 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
c2f3636e4a
commit
6d620cd5e5
|
@ -1441,6 +1441,10 @@ final class _WP_Editors {
|
|||
if ( ! isset( $concatenate_scripts ) ) {
|
||||
script_concat_settings();
|
||||
}
|
||||
|
||||
wp_print_scripts( array( 'wp-tinymce' ) );
|
||||
|
||||
echo "<script type='text/javascript'>\n" . self::wp_mce_translation() . "</script>\n";
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -684,7 +684,7 @@ function wp_default_scripts( &$scripts ) {
|
|||
|
||||
$scripts->add( 'colorpicker', "/wp-includes/js/colorpicker$suffix.js", array( 'prototype' ), '3517m' );
|
||||
|
||||
$scripts->add( 'editor', "/wp-admin/js/editor$suffix.js", array( 'wp-tinymce', 'utils', 'jquery' ), false, 1 );
|
||||
$scripts->add( 'editor', "/wp-admin/js/editor$suffix.js", array( 'utils', 'jquery' ), false, 1 );
|
||||
|
||||
// Back-compat for old DFW. To-do: remove at the end of 2016.
|
||||
$scripts->add( 'wp-fullscreen-stub', "/wp-admin/js/wp-fullscreen-stub$suffix.js", array(), false, 1 );
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '5.1-alpha-44118';
|
||||
$wp_version = '5.1-alpha-44119';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
|
Loading…
Reference in New Issue