Changeset 46287

Timestamp:

09/24/2019 02:55:56 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Script Loader: Add function_exists() checks for is_admin() and current_theme_supports(), to accomodate for using WP_Dependencies as a standalone class.

Remove <![CDATA[ when outputting HTML5 script tags.

Props azaozz.
Fixes #42804.

Location:

trunk/src/wp-includes

Files:

• class.wp-scripts.php (modified) (2 diffs)
• class.wp-styles.php (modified) (1 diff)

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

@@ -150 +150 @@
      */
     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'";
         }
@@ -221 +225 @@
         }
 
-        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";
+
+        // CDATA is not needed for HTML 5.
+        if ( $this->type_attr ) {
+            echo "/* <![CDATA[ */\n";
+        }
+
         echo "$output\n";
-        echo "/* ]]> */\n";
+
+        if ( $this->type_attr ) {
+            echo "/* ]]> */\n";
+        }
+
         echo "</script>\n";
 

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

@@ -118 +118 @@
      */
     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'";
         }