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
This commit is contained in:
parent
88bf910518
commit
150b301ac0
@ -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.
|
||||
*
|
||||
|
@ -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'";
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user