Changeset 21132 for trunk/wp-includes/class.wp-scripts.php

Timestamp:

06/26/2012 05:33:19 AM (12 years ago)

Author:

nacin

Message:

If a plugin triggers the WP_Scripts constructor prior to init, fire wp_default_scripts()
then and again on init.

Only add our localized strings once we've fired init, in case we do have the situation
where we fire wp_default_scripts() twice.

Fixes issues where plugins or themes try to enqueue a default script handle prior to
init. Does not allow #19959 to regress.

see #20971 for trunk.

File:

• trunk/wp-includes/class.wp-scripts.php (modified) (1 diff)

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

@@ -32 +32 @@
 
     function __construct() {
-        if ( ! function_exists( 'did_action' ) || did_action( 'init' ) )
-            $this->init();
-        else
-            add_action( 'init', array( $this, 'init' ), 0 );
+        $this->init();
+        add_action( 'init', array( $this, 'init' ), 0 );
     }