Skip to content

Script Loader: Enable wp_script_attributes filter in _print_scripts() #11702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sukhendu2002 wants to merge 1 commit into
base: trunk
Choose a base branch
from
+7 −9
Open

Script Loader: Enable wp_script_attributes filter in _print_scripts() #11702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/wp-includes/script-loader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2231,10 +2231,9 @@ function _print_scripts() {

if ( $concat ) {
if ( ! empty( $wp_scripts->print_code ) ) {
echo "\n<script>\n";
echo $wp_scripts->print_code;
echo sprintf( "\n//# sourceURL=%s\n", rawurlencode( 'js-inline-concat-' . $concat ) );
echo "</script>\n";
$inline_code = $wp_scripts->print_code
. sprintf( "\n//# sourceURL=%s", rawurlencode( 'js-inline-concat-' . $concat ) );
wp_print_inline_script_tag( $inline_code );
}

$concat = str_split( $concat, 128 );
Expand All @@ -2245,7 +2244,7 @@ function _print_scripts() {
}

$src = $wp_scripts->base_url . "/wp-admin/load-scripts.php?c={$zip}" . $concatenated . '&ver=' . $wp_scripts->default_version;
echo "<script src='" . esc_attr( $src ) . "'></script>\n";
wp_print_script_tag( array( 'src' => $src ) );
}

if ( ! empty( $wp_scripts->print_html ) ) {
Expand Down
7 changes: 3 additions & 4 deletions tests/phpunit/tests/dependencies/scripts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2058,9 +2058,9 @@ public function test_script_concatenation() {
wp_print_scripts();
$print_scripts = get_echo( '_print_scripts' );

$expected = "<script src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=one,two,three&amp;ver={$wp_version}'></script>\n";
$expected = "<script src=\"/wp-admin/load-scripts.php?c=0&#038;load%5Bchunk_0%5D=one,two,three&#038;ver={$wp_version}\"></script>\n";

$this->assertSame( $expected, $print_scripts );
$this->assertEqualHTML( $expected, $print_scripts );
}

/**
Expand Down Expand Up @@ -4093,12 +4093,11 @@ public function test_source_url_with_concat() {
$print_scripts = get_echo( '_print_scripts' );

$expected = <<<HTML

<script>
var one = {"key":"val"};var two = {"key":"val"};
//# sourceURL=js-inline-concat-one%2Ctwo
</script>
<script src="/wp-admin/load-scripts.php?c=0&load%5Bchunk_0%5D=one,two&ver={$wp_version}"></script>
<script src="/wp-admin/load-scripts.php?c=0&#038;load%5Bchunk_0%5D=one,two&#038;ver={$wp_version}"></script>

HTML;

Expand Down
Loading