Changeset 46164 for trunk/src/wp-includes/class.wp-styles.php

Timestamp:

09/18/2019 02:49:30 PM (7 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/class.wp-styles.php (modified) (6 diffs)

trunk/src/wp-includes/class.wp-styles.php

@@ -102 +102 @@
 
     /**
+     * Holds a string which contains the type attribute for style tag.
+     *
+     * If the current theme does not declare HTML5 support for 'style',
+     * then it initializes as `type='text/css'`.
+     *
+     * @since 5.3.0
+     * @var string
+     */
+    private $type_attr = '';
+
+    /**
      * Constructor.
      *
@@ -115 +126 @@
          */
         do_action_ref_array( 'wp_default_styles', array( &$this ) );
+
+        if ( ! current_theme_supports( 'html5', 'style' ) ) {
+            $this->type_attr = " type='text/css'";
+        }
     }
 
@@ -157 +172 @@
 
         if ( $inline_style ) {
-            $inline_style_tag = sprintf( "<style id='%s-inline-css' type='text/css'>\n%s\n</style>\n", esc_attr( $handle ), $inline_style );
+            $inline_style_tag = sprintf(
+                "<style id='%s-inline-css'%s>\n%s\n</style>\n",
+                esc_attr( $handle ),
+                $this->type_attr,
+                $inline_style
+            );
         } else {
             $inline_style_tag = '';
@@ -198 +218 @@
 
         $rel   = isset( $obj->extra['alt'] ) && $obj->extra['alt'] ? 'alternate stylesheet' : 'stylesheet';
-        $title = isset( $obj->extra['title'] ) ? "title='" . esc_attr( $obj->extra['title'] ) . "'" : '';
-
-        $tag = "<link rel='$rel' id='$handle-css' $title href='$href' type='text/css' media='$media' />\n";
+        $title = isset( $obj->extra['title'] ) ? sprintf( "title='%s'", esc_attr( $obj->extra['title'] ) ) : '';
+
+        $tag = sprintf(
+            "<link rel='%s' id='%s-css' %s href='%s'%s media='%s' />\n",
+            $rel,
+            $handle,
+            $title,
+            $href,
+            $this->type_attr,
+            $media
+        );
 
         /**
@@ -224 +252 @@
             }
 
-            $rtl_tag = "<link rel='$rel' id='$handle-rtl-css' $title href='$rtl_href' type='text/css' media='$media' />\n";
+            $rtl_tag = sprintf(
+                "<link rel='%s' id='%s-rtl-css' %s href='%s'%s media='%s' />\n",
+                $rel,
+                $handle,
+                $title,
+                $rtl_href,
+                $this->type_attr,
+                $media
+            );
+
             /** This filter is documented in wp-includes/class.wp-styles.php */
             $rtl_tag = apply_filters( 'style_loader_tag', $rtl_tag, $handle, $rtl_href, $media );
@@ -299 +336 @@
         }
 
-        printf( "<style id='%s-inline-css' type='text/css'>\n%s\n</style>\n", esc_attr( $handle ), $output );
+        printf(
+            "<style id='%s-inline-css'%s>\n%s\n</style>\n",
+            esc_attr( $handle ),
+            $this->type_attr,
+            $output
+        );
 
         return true;