Changeset 58935 for trunk/src/wp-admin/load-scripts.php

Timestamp:

08/25/2024 11:47:01 PM (10 months ago)

Author:

peterwilsoncc

Message:

Script Loader: Refactor Etag generation for concatenated assets.

Move Etag HTTP header generation in load-scripts.php and load-styles.php to WP_Dependencies.

Introduces the method WP_Dependencies::get_etag() and associated unit tests.

Follow up to [57943].

Props vrajadas, martinkrcho, mukesh27.
Fixes #61485.

File:

• trunk/src/wp-admin/load-scripts.php (modified) (1 diff)

trunk/src/wp-admin/load-scripts.php

@@ -53 +53 @@
 wp_default_packages_scripts( $wp_scripts );
 
-$etag = "WP:{$wp_version};";
-
-foreach ( $load as $handle ) {
-    if ( ! array_key_exists( $handle, $wp_scripts->registered ) ) {
-        continue;
-    }
-
-    $ver   = $wp_scripts->registered[ $handle ]->ver ? $wp_scripts->registered[ $handle ]->ver : $wp_version;
-    $etag .= "{$handle}:{$ver};";
-}
-
-/*
- * This is not intended to be cryptographically secure, just a fast way to get
- * a fixed length string based on the script versions. As this file does not
- * load the full WordPress environment, it is not possible to use the salted
- * wp_hash() function.
- */
-$etag = 'W/"' . md5( $etag ) . '"';
+$etag = $wp_scripts->get_etag( $load );
 
 if ( isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) && stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) === $etag ) {