Changeset 46171

Timestamp:

09/18/2019 10:41:29 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Script Loader: Move the current_theme_supports() check above the wp_default_(scripts|styles) action, for consistency.

See #42804.

Location:

trunk/src/wp-includes

Files:

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

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

@@ -142 +142 @@
         $this->init();
         add_action( 'init', array( $this, 'init' ), 0 );
-
+    }
+
+    /**
+     * Initialize the class.
+     *
+     * @since 3.4.0
+     */
+    public function init() {
         if ( ! is_admin() && ! current_theme_supports( 'html5', 'script' ) ) {
             $this->type_attr = " type='text/javascript'";
         }
-    }
-
-    /**
-     * Initialize the class.
-     *
-     * @since 3.4.0
-     */
-    public function init() {
+
         /**
          * Fires when the WP_Scripts instance is initialized.

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

@@ -118 +118 @@
      */
     public function __construct() {
+        if ( ! is_admin() && ! current_theme_supports( 'html5', 'style' ) ) {
+            $this->type_attr = " type='text/css'";
+        }
+
         /**
          * Fires when the WP_Styles instance is initialized.
@@ -126 +130 @@
          */
         do_action_ref_array( 'wp_default_styles', array( &$this ) );
-
-        if ( ! is_admin() && ! current_theme_supports( 'html5', 'style' ) ) {
-            $this->type_attr = " type='text/css'";
-        }
     }