Changeset 46164 for trunk/src/wp-includes/theme.php

Timestamp:

09/18/2019 02:49:30 PM (5 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/theme.php (modified) (7 diffs)

trunk/src/wp-includes/theme.php

@@ -703 +703 @@
         return;
     }
-    echo '<link rel="stylesheet" href="' . $stylesheet . '" type="text/css" media="screen" />';
+
+    $type_attr = current_theme_supports( 'html5', 'style' ) ? '' : ' type="text/css"';
+
+    printf(
+        '<link rel="stylesheet" href="%s"%s media="screen" />',
+        $stylesheet,
+        $type_attr
+    );
 }
 
@@ -1642 +1649 @@
     if ( ! $background && ! $color ) {
         if ( is_customize_preview() ) {
-            echo '<style type="text/css" id="custom-background-css"></style>';
+            $type_attr = current_theme_supports( 'html5', 'style' ) ? '' : ' type="text/css"';
+            printf( '<style%s id="custom-background-css"></style>', $type_attr );
         }
         return;
@@ -1694 +1702 @@
 
         $style .= $image . $position . $size . $repeat . $attachment;
+
+        $type_attr = current_theme_supports( 'html5', 'style' ) ? '' : ' type="text/css"';
     }
     ?>
-<style type="text/css" id="custom-background-css">
+<style<?php echo $type_attr; ?> id="custom-background-css">
 body.custom-background { <?php echo trim( $style ); ?> }
 </style>
@@ -1710 +1720 @@
     $styles = wp_get_custom_css();
     if ( $styles || is_customize_preview() ) :
+        $type_attr = current_theme_supports( 'html5', 'style' ) ? '' : ' type="text/css"';
         ?>
-        <style type="text/css" id="wp-custom-css">
+        <style<?php echo $type_attr; ?> id="wp-custom-css">
             <?php echo strip_tags( $styles ); // Note that esc_html() cannot be used because `div &gt; span` is not interpreted properly. ?>
         </style>
@@ -2336 +2347 @@
  *
  * @since 2.9.0
- * @since 3.6.0 The `html5` feature was added
- * @since 3.9.0 The `html5` feature now also accepts 'gallery' and 'caption'
- * @since 4.1.0 The `title-tag` feature was added
- * @since 4.5.0 The `customize-selective-refresh-widgets` feature was added
- * @since 4.7.0 The `starter-content` feature was added
+ * @since 3.6.0 The `html5` feature was added.
+ * @since 3.9.0 The `html5` feature now also accepts 'gallery' and 'caption'.
+ * @since 4.1.0 The `title-tag` feature was added.
+ * @since 4.5.0 The `customize-selective-refresh-widgets` feature was added.
+ * @since 4.7.0 The `starter-content` feature was added.
  * @since 5.0.0 The `responsive-embeds`, `align-wide`, `dark-editor-style`, `disable-custom-colors`,
  *              `disable-custom-font-sizes`, `editor-color-palette`, `editor-font-sizes`,
  *              `editor-styles`, and `wp-block-styles` features were added.
+ * @since 5.3.0 The `html5` feature now also accepts 'script' and 'style'.
  *
  * @global array $_wp_theme_features
@@ -2636 +2648 @@
         $classes = '.' . implode( ', .', $classes );
 
+        $type_attr = current_theme_supports( 'html5', 'style' ) ? '' : ' type="text/css"';
         ?>
         <!-- Custom Logo: hide header text -->
-        <style id="custom-logo-css" type="text/css">
+        <style id="custom-logo-css"<?php echo $type_attr; ?>>
             <?php echo $classes; ?> {
                 position: absolute;
@@ -3197 +3210 @@
     $home_origin  = parse_url( home_url() );
     $cross_domain = ( strtolower( $admin_origin['host'] ) != strtolower( $home_origin['host'] ) );
-
+    $type_attr    = current_theme_supports( 'html5', 'script' ) ? '' : ' type="text/javascript"';
     ?>
     <!--[if lte IE 8]>
-        <script type="text/javascript">
+        <script<?php echo $type_attr; ?>>
             document.body.className = document.body.className.replace( /(^|\s)(no-)?customize-support(?=\s|$)/, '' ) + ' no-customize-support';
         </script>
     <![endif]-->
     <!--[if gte IE 9]><!-->
-        <script type="text/javascript">
+        <script<?php echo $type_attr; ?>>
             (function() {
                 var request, b = document.body, c = 'className', cs = 'customize-support', rcs = new RegExp('(^|\\s+)(no-)?'+cs+'(\\s+|$)');