From c7cc0cebe000b683c2762692318a7e0c951ed87f Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 18 Dec 2018 04:04:21 +0000 Subject: [PATCH] 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. git-svn-id: https://develop.svn.wordpress.org/trunk@44286 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/script-loader.php | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index 629029d9d0..2ca5ffc127 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -178,6 +178,24 @@ function wp_get_script_polyfill( &$scripts, $tests ) { continue; } + $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... '( ' . $test . ' ) || ' . @@ -185,7 +203,7 @@ function wp_get_script_polyfill( &$scripts, $tests ) { // at the `document.write`. Its caveat of synchronous mid-stream // blocking write is exactly the behavior we need though. 'document.write( \'