Changeset 48898

Timestamp:

08/27/2020 09:59:17 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Script Loader: Disable concatenation for scripts with translations to ensure they are printed in the right order.

Props herregroen, ocean90, desrosj, mikeyarce, bobbingwide, audrasjb, johnbillion.
Merges [48897] to the 5.5 branch.
Fixes #50999.

Location:

branches/5.5

Files:

• . (modified) (1 prop)
• src/wp-includes/class.wp-scripts.php (modified) (3 diffs)

branches/5.5/src/wp-includes/class.wp-scripts.php

@@ -310 +310 @@
                 } else {
                         $inline_script_tag = '';
+                }
+
+                $translations = $this->print_translations( $handle, false );
+                if ( $translations ) {
+                        $translations = sprintf( "<script%s id='%s-js-translations'>\n%s\n</script>\n", $this->type_attr, esc_attr( $handle ), $translations );
                 }
 
@@ -323 +328 @@
                         $srce = apply_filters( 'script_loader_src', $src, $handle );
 
-                        if ( $this->in_default_dir( $srce ) && ( $before_handle || $after_handle ) ) {
+                        if ( $this->in_default_dir( $srce ) && ( $before_handle || $after_handle || $translations ) ) {
                                 $this->do_concat = false;
 
@@ -365 +370 @@
                 }
 
-                $translations = $this->print_translations( $handle, false );
-                if ( $translations ) {
-                        $translations = sprintf( "<script%s id='%s-js-translations'>\n%s\n</script>\n", $this->type_attr, esc_attr( $handle ), $translations );
-                }
-
                 if ( ! preg_match( '|^(https?:)?//|', $src ) && ! ( $this->content_url && 0 === strpos( $src, $this->content_url ) ) ) {
                         $src = $this->base_url . $src;