summaryrefslogtreecommitdiffstats
path: root/wp-admin/load-styles.php
diff options
context:
space:
mode:
Diffstat (limited to 'wp-admin/load-styles.php')
-rw-r--r--wp-admin/load-styles.php23
1 files changed, 21 insertions, 2 deletions
diff --git a/wp-admin/load-styles.php b/wp-admin/load-styles.php
index fe4a4ee..9fd0fc1 100644
--- a/wp-admin/load-styles.php
+++ b/wp-admin/load-styles.php
@@ -48,7 +48,26 @@ $out = '';
$wp_styles = new WP_Styles();
wp_default_styles( $wp_styles );
-if ( isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) && stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) === $wp_version ) {
+$etag = "WP:{$wp_version};";
+
+foreach ( $load as $handle ) {
+ if ( ! array_key_exists( $handle, $wp_styles->registered ) ) {
+ continue;
+ }
+
+ $ver = $wp_styles->registered[ $handle ]->ver ? $wp_styles->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 ) . '"';
+
+if ( isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) && stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) === $etag ) {
header( "$protocol 304 Not Modified" );
exit;
}
@@ -84,7 +103,7 @@ foreach ( $load as $handle ) {
}
}
-header( "Etag: $wp_version" );
+header( "Etag: $etag" );
header( 'Content-Type: text/css; charset=UTF-8' );
header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', time() + $expires_offset ) . ' GMT' );
header( "Cache-Control: public, max-age=$expires_offset" );