From 150b301ac0ad9fbd6d41ee66e90c12fdb4d23e6d Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 18 Sep 2019 22:41:29 +0000 Subject: [PATCH] Script Loader: Move the `current_theme_supports()` check above the `wp_default_(scripts|styles)` action, for consistency. See #42804. git-svn-id: https://develop.svn.wordpress.org/trunk@46171 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/class.wp-scripts.php | 8 ++++---- src/wp-includes/class.wp-styles.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/wp-includes/class.wp-scripts.php b/src/wp-includes/class.wp-scripts.php index 00a782b3ef..9d1b706343 100644 --- a/src/wp-includes/class.wp-scripts.php +++ b/src/wp-includes/class.wp-scripts.php @@ -141,10 +141,6 @@ class WP_Scripts extends WP_Dependencies { public function __construct() { $this->init(); add_action( 'init', array( $this, 'init' ), 0 ); - - if ( ! is_admin() && ! current_theme_supports( 'html5', 'script' ) ) { - $this->type_attr = " type='text/javascript'"; - } } /** @@ -153,6 +149,10 @@ class WP_Scripts extends WP_Dependencies { * @since 3.4.0 */ public function init() { + if ( ! is_admin() && ! current_theme_supports( 'html5', 'script' ) ) { + $this->type_attr = " type='text/javascript'"; + } + /** * Fires when the WP_Scripts instance is initialized. * diff --git a/src/wp-includes/class.wp-styles.php b/src/wp-includes/class.wp-styles.php index 3673b9e319..4c1d4f53a1 100644 --- a/src/wp-includes/class.wp-styles.php +++ b/src/wp-includes/class.wp-styles.php @@ -117,6 +117,10 @@ class WP_Styles extends WP_Dependencies { * @since 2.6.0 */ 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. * @@ -125,10 +129,6 @@ class WP_Styles extends WP_Dependencies { * @param WP_Styles $this WP_Styles instance (passed by reference). */ do_action_ref_array( 'wp_default_styles', array( &$this ) ); - - if ( ! is_admin() && ! current_theme_supports( 'html5', 'style' ) ) { - $this->type_attr = " type='text/css'"; - } } /**