Changeset 61411 for trunk/src/wp-includes/script-loader.php

Timestamp:

12/26/2025 01:14:22 PM (5 months ago)

Author:

jonsurrell

Message:

Scripts: Remove default type attribute from tags.

SCRIPT, STYLE, and stylesheet LINK tags do not require a type attribute since the HTML5 standard was released in 2008. Removing the type attribute simplifies logic and normalizes the produced HTML content.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/10658.

Follow-up to [46164].

Props hardikhuptechdev, jonsurrell, dmsnell, westonruter.
Fixes #64428. See #59883, #64442.

File:

• trunk/src/wp-includes/script-loader.php (modified) (7 diffs)

trunk/src/wp-includes/script-loader.php

@@ -2206 +2206 @@
     }
 
-    $concat    = trim( $wp_scripts->concat, ', ' );
-    $type_attr = current_theme_supports( 'html5', 'script' ) ? '' : " type='text/javascript'";
+    $concat = trim( $wp_scripts->concat, ', ' );
 
     if ( $concat ) {
         if ( ! empty( $wp_scripts->print_code ) ) {
-            echo "\n<script{$type_attr}>\n";
+            echo "\n<script>\n";
             echo "/* <![CDATA[ */\n"; // Not needed in HTML 5.
             echo $wp_scripts->print_code;
@@ -2227 +2226 @@
 
         $src = $wp_scripts->base_url . "/wp-admin/load-scripts.php?c={$zip}" . $concatenated . '&ver=' . $wp_scripts->default_version;
-        echo "<script{$type_attr} src='" . esc_attr( $src ) . "'></script>\n";
+        echo "<script src='" . esc_attr( $src ) . "'></script>\n";
     }
 
@@ -2399 +2398 @@
     }
 
-    $concat    = trim( $wp_styles->concat, ', ' );
-    $type_attr = current_theme_supports( 'html5', 'style' ) ? '' : ' type="text/css"';
+    $concat = trim( $wp_styles->concat, ', ' );
 
     if ( $concat ) {
@@ -2415 +2413 @@
 
         $href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&dir={$dir}" . $concatenated . '&ver=' . $ver;
-        echo "<link rel='stylesheet' href='" . esc_attr( $href ) . "'{$type_attr} media='all' />\n";
+        echo "<link rel='stylesheet' href='" . esc_attr( $href ) . "' media='all' />\n";
 
         if ( ! empty( $wp_styles->print_code ) ) {
-            echo "<style{$type_attr}>\n";
+            echo "<style>\n";
             echo $wp_styles->print_code;
             echo sprintf( "\n/*# sourceURL=%s */", rawurlencode( $concat_source_url ) );
@@ -2906 +2904 @@
  */
 function wp_get_script_tag( $attributes ) {
-    if ( ! isset( $attributes['type'] ) && ! is_admin() && ! current_theme_supports( 'html5', 'script' ) ) {
-        // Keep the type attribute as the first for legacy reasons (it has always been this way in core).
-        $attributes = array_merge(
-            array( 'type' => 'text/javascript' ),
-            $attributes
-        );
-    }
     /**
      * Filters attributes to be added to a script tag.
@@ -2954 +2945 @@
  */
 function wp_get_inline_script_tag( $data, $attributes = array() ) {
-    $is_html5 = current_theme_supports( 'html5', 'script' ) || is_admin();
-    if ( ! isset( $attributes['type'] ) && ! $is_html5 ) {
-        // Keep the type attribute as the first for legacy reasons (it has always been this way in core).
-        $attributes = array_merge(
-            array( 'type' => 'text/javascript' ),
-            $attributes
-        );
-    }
-
     /*
      * XHTML extracts the contents of the SCRIPT element and then the XML parser
@@ -2988 +2970 @@
      */
     if (
-        ! $is_html5 &&
+        ! current_theme_supports( 'html5', 'script' ) &&
         (
             ! isset( $attributes['type'] ) ||