From 37d37baf190e16d28e7f539c5ed3485776f3a2a0 Mon Sep 17 00:00:00 2001
From: Dion Hulse <contact@dd32.id.au>
Date: Wed, 24 Jun 2020 15:24:07 +1000
Subject: [PATCH] Use a more specific `<script>` matching (#23407)

* Use a more specific matching pattern to only affect the `<script>` tags which we're interested in.

This uses the full `<script>` produced by `WP_Scripts::do_item()` ignoring the Translations and before/after inline scripts, which allows for it to exclude `<script%` tags contained within the before/after html chunks.

* Rename the variable
---
 lib/block-directory.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/block-directory.php b/lib/block-directory.php
index 167bb0b9e44e99..f1956f8bfbe838 100644
--- a/lib/block-directory.php
+++ b/lib/block-directory.php
@@ -22,18 +22,24 @@ function gutenberg_enqueue_block_editor_assets_block_directory() {
 	/**
 	 * Add data attribute of handle to all script tags output in the wp-admin.
 	 *
-	 * @param string $tag    The `<script>` tag for the enqueued script.
-	 * @param string $handle The script's registered handle.
+	 * @param string $tag     The `<script>` tag for the enqueued script.
+	 * @param string $handle  The script's registered handle.
+	 * @param string $esc_src The script's pre-escaped registered src.
 	 *
-	 * @return string  Filter script tag.
+	 * @return string  Filtered script tag.
 	 */
-	function gutenberg_change_script_tag( $tag, $handle ) {
+	function gutenberg_change_script_tag( $tag, $handle, $esc_src ) {
 		if ( ! is_admin() ) {
 			return $tag;
 		}
-		$tag = str_replace( '<script ', sprintf( '<script data-handle="%s" ', esc_attr( $handle ) ), $tag );
+
+		$tag = str_replace(
+			sprintf( "<script src='%s'></script>", $esc_src ),
+			sprintf( "<script data-handle='%s' src='%s'></script>", esc_attr( $handle ), $esc_src ),
+			$tag
+		);
 
 		return $tag;
 	}
-	add_filter( 'script_loader_tag', 'gutenberg_change_script_tag', 10, 2 );
+	add_filter( 'script_loader_tag', 'gutenberg_change_script_tag', 1, 3 );
 }