Changeset 18556 for trunk/wp-includes/functions.wp-scripts.php

Timestamp:

08/17/2011 05:48:13 AM (15 years ago)

Author:

azaozz

Message:

Add _doing_it_wrong() when a plugin or theme accesses $wp_scripts or $wp_styles too early (also fixes localization), props SergeyBiryukov, fixes #11526

File:

• trunk/wp-includes/functions.wp-scripts.php (modified) (7 diffs)

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

@@ -48 +48 @@
 function wp_register_script( $handle, $src, $deps = array(), $ver = false, $in_footer = false ) {
         global $wp_scripts;
-        if ( !is_a($wp_scripts, 'WP_Scripts') )
-                $wp_scripts = new WP_Scripts();
+
+        wp_scripts_init();
 
         $wp_scripts->add( $handle, $src, $deps, $ver );
@@ -76 +76 @@
 function wp_localize_script( $handle, $name, $data ) {
         global $wp_scripts;
-        if ( !is_a($wp_scripts, 'WP_Scripts') )
-                return false;
+
+        wp_scripts_init();
 
         return $wp_scripts->add_script_data( $handle, $name, $data );
@@ -90 +90 @@
 function wp_deregister_script( $handle ) {
         global $wp_scripts;
-        if ( !is_a($wp_scripts, 'WP_Scripts') )
-                $wp_scripts = new WP_Scripts();
+
+        wp_scripts_init();
 
         $wp_scripts->remove( $handle );
@@ -106 +106 @@
 function wp_enqueue_script( $handle, $src = false, $deps = array(), $ver = false, $in_footer = false ) {
         global $wp_scripts;
-        if ( !is_a($wp_scripts, 'WP_Scripts') )
-                $wp_scripts = new WP_Scripts();
+
+        wp_scripts_init();
 
         if ( $src ) {
@@ -126 +126 @@
 function wp_dequeue_script( $handle ) {
         global $wp_scripts;
-        if ( !is_a($wp_scripts, 'WP_Scripts') )
-                $wp_scripts = new WP_Scripts();
+
+        wp_scripts_init();
 
         $wp_scripts->dequeue( $handle );
@@ -146 +146 @@
 function wp_script_is( $handle, $list = 'queue' ) {
         global $wp_scripts;
-        if ( !is_a($wp_scripts, 'WP_Scripts') )
-                $wp_scripts = new WP_Scripts();
+
+        wp_scripts_init();
 
         $query = $wp_scripts->query( $handle, $list );
@@ -156 +156 @@
         return $query;
 }
+
+/**
+ * Initializes $wp_scripts global (if it hasn't already been initialized by a faulty plugin or theme).
+ *
+ * @since 3.3
+ */
+function wp_scripts_init() {
+        global $wp_scripts;
+        static $done = false;
+
+        if ( !$done && !is_a($wp_scripts, 'WP_Scripts') ) {
+                if ( !did_action('after_setup_theme') ) { // last action before init
+                        $func = debug_backtrace();
+                        $trace = !empty($func[1]['function']) ? $func[1]['function'] : __FUNCTION__;
+
+                        _doing_it_wrong( $trace, __( '$wp_scripts should not be accessed before the "init" hook.' ), '3.3' );
+                }
+
+                $wp_scripts = new WP_Scripts();
+                $done = true;
+        }
+}
+