Ticket #42804: 42804.2.diff

src/wp-includes/class.wp-scripts.php

@@ -149 +149 @@
          * @since 3.4.0
          */
         public function init() {
-                if ( ! is_admin() && ! current_theme_supports( 'html5', 'script' ) ) {
+                if ( function_exists( 'is_admin' ) && ! is_admin() && function_exists( 'current_theme_supports' ) && ! current_theme_supports( 'html5', 'script' ) ) {
                         $this->type_attr = " type='text/javascript'";
                 }
 
@@ -220 +220 @@
                         return $output;
                 }
 
-                echo "<script{$this->type_attr}>\n"; // CDATA and type="text/javascript" is not needed for HTML 5.
-                echo "/* <![CDATA[ */\n";
+                echo "<script{$this->type_attr}>\n";
+
+                if ( $this->type_attr ) {
+                        echo "/* <![CDATA[ */\n";
+                }
+
                 echo "$output\n";
-                echo "/* ]]> */\n";
+
+                if ( $this->type_attr ) {
+                        echo "/* ]]> */\n";
+                }
+
                 echo "</script>\n";
 
                 return true;

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

@@ -117 +117 @@
          * @since 2.6.0
          */
         public function __construct() {
-                if ( ! is_admin() && ! current_theme_supports( 'html5', 'style' ) ) {
+                if ( function_exists( 'is_admin' ) && ! is_admin() && function_exists( 'current_theme_supports' ) && ! current_theme_supports( 'html5', 'style' ) ) {
                         $this->type_attr = " type='text/css'";
                 }