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

Timestamp:

09/18/2019 02:49:30 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Script Loader: Introduce HTML5 support for scripts and styles.

When a theme declares HTML5 support for script and styles via add_theme_support( 'html5', array( 'script', 'style' ) ), the type="text/javascript" and type="text/css" attributes are omitted.

These attributes are unnecessary in HTML5 and cause warnings in the W3C Markup Validation Service.

Props sasiddiqui, swissspidy, knutsp, SergeyBiryukov.
See #42804.

File:

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

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

@@ -2466 +2466 @@
     }
 
-    $concat = trim( $wp_scripts->concat, ', ' );
+    $concat    = trim( $wp_scripts->concat, ', ' );
+    $type_attr = current_theme_supports( 'html5', 'script' ) ? '' : " type='text/javascript'";
 
     if ( $concat ) {
         if ( ! empty( $wp_scripts->print_code ) ) {
-            echo "\n<script type='text/javascript'>\n";
+            echo "\n<script{$type_attr}>\n";
             echo "/* <![CDATA[ */\n"; // not needed in HTML 5
             echo $wp_scripts->print_code;
@@ -2485 +2486 @@
 
         $src = $wp_scripts->base_url . "/wp-admin/load-scripts.php?c={$zip}" . $concatenated . '&ver=' . $wp_scripts->default_version;
-        echo "<script type='text/javascript' src='" . esc_attr( $src ) . "'></script>\n";
+        echo "<script{$type_attr} src='" . esc_attr( $src ) . "'></script>\n";
     }
 
@@ -2647 +2648 @@
     }
 
-    $concat = trim( $wp_styles->concat, ', ' );
+    $concat    = trim( $wp_styles->concat, ', ' );
+    $type_attr = current_theme_supports( 'html5', 'style' ) ? '' : ' type="text/css"';
 
     if ( $concat ) {
@@ -2661 +2663 @@
 
         $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='text/css' media='all' />\n";
+        echo "<link rel='stylesheet' href='" . esc_attr( $href ) . "'{$type_attr} media='all' />\n";
 
         if ( ! empty( $wp_styles->print_code ) ) {
-            echo "<style type='text/css'>\n";
+            echo "<style{$type_attr}>\n";
             echo $wp_styles->print_code;
             echo "\n</style>\n";