Changeset 44237

Timestamp:

12/16/2018 08:37:30 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Script Loader: Ensure default packages are registered when loaded via load-scripts.php.

Props CantoThemes, ocean90.
Merges [43877] to trunk.
Fixes #45271.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-admin/load-scripts.php (modified) (1 diff)
• src/wp-includes/script-loader.php (modified) (3 diffs)

trunk/src/wp-admin/load-scripts.php

@@ -36 +36 @@
 $wp_scripts = new WP_Scripts();
 wp_default_scripts( $wp_scripts );
+wp_default_packages_vendor( $wp_scripts );
+wp_default_packages_scripts( $wp_scripts );
 
 if ( isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) && stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) === $wp_version ) {

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

@@ -44 +44 @@
 function wp_register_tinymce_scripts( &$scripts, $force_uncompressed = false ) {
     global $tinymce_version, $concatenate_scripts, $compress_scripts;
-    $suffix = SCRIPT_DEBUG ? '' : '.min';
+    $suffix     = wp_scripts_get_suffix();
+    $dev_suffix = wp_scripts_get_suffix( 'dev' );
 
     script_concat_settings();
@@ -53 +54 @@
     // Load tinymce.js when running from /src, otherwise load wp-tinymce.js.gz (in production) or
     // tinymce.min.js (when SCRIPT_DEBUG is true).
-    $mce_suffix = false !== strpos( get_bloginfo( 'version' ), '-src' ) ? '' : '.min';
     if ( $compressed ) {
         $scripts->add( 'wp-tinymce', includes_url( 'js/tinymce/' ) . 'wp-tinymce.php', array(), $tinymce_version );
     } else {
-        $scripts->add( 'wp-tinymce-root', includes_url( 'js/tinymce/' ) . "tinymce$mce_suffix.js", array(), $tinymce_version );
-        $scripts->add( 'wp-tinymce', includes_url( 'js/tinymce/' ) . "plugins/compat3x/plugin$suffix.js", array( 'wp-tinymce-root' ), $tinymce_version );
+        $scripts->add( 'wp-tinymce-root', includes_url( 'js/tinymce/' ) . "tinymce$dev_suffix.js", array(), $tinymce_version );
+        $scripts->add( 'wp-tinymce', includes_url( 'js/tinymce/' ) . "plugins/compat3x/plugin$dev_suffix.js", array( 'wp-tinymce-root' ), $tinymce_version );
     }
 
@@ -75 +75 @@
  */
 function wp_default_packages_vendor( &$scripts ) {
-    wp_register_tinymce_scripts( $scripts );
-
     $dev_suffix = wp_scripts_get_suffix( 'dev' );