Changeset 44286

Timestamp:

12/18/2018 04:04:21 AM (8 years ago)

Author:

SergeyBiryukov

Message:

Scripts: Ensure sub-directory WordPress installs can load polyfill scripts.

wp_get_script_polyfill() bypasses WP_Scripts::do_item(), so didn't transform the script path into its fully qualified URL.

Props swissspidy, ocean90.
Merges [43960] to trunk.
Fixes #45469.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-includes/script-loader.php (modified) (2 diffs)

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

@@ -179 +179 @@
                 }
 
+                $src = $scripts->registered[ $handle ]->src;
+                $ver = $scripts->registered[ $handle ]->ver;
+
+                if ( ! preg_match( '|^(https?:)?//|', $src ) && ! ( $scripts->content_url && 0 === strpos( $src, $scripts->content_url ) ) ) {
+                        $src = $scripts->base_url . $src;
+                }
+
+                if ( ! empty( $ver ) ) {
+                        $src = add_query_arg( 'ver', $ver, $src );
+                }
+
+                /** This filter is documented in wp-includes/class.wp-scripts.php */
+                $src = esc_url( apply_filters( 'script_loader_src', $src, $handle ) );
+
+                if ( ! $src ) {
+                        continue;
+                }
+
                 $polyfill .= (
                         // Test presence of feature...
@@ -186 +204 @@
                         // blocking write is exactly the behavior we need though.
                         'document.write( \'<script src="' .
-                        esc_url( $scripts->registered[ $handle ]->src ) .
+                        $src .
                         '"></scr\' + \'ipt>\' );'
                 );