Changeset 44119 for trunk

Timestamp:

12/13/2018 07:18:58 PM (6 years ago)

Author:

desrosj

Message:

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.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-editor.php (modified) (1 diff)
• src/wp-includes/script-loader.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-editor.php

@@ -1442 +1442 @@
             script_concat_settings();
         }
+
+        wp_print_scripts( array( 'wp-tinymce' ) );
+
+        echo "<script type='text/javascript'>\n" . self::wp_mce_translation() . "</script>\n";
     }
 

trunk/src/wp-includes/script-loader.php

@@ -685 +685 @@
     $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.