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

Timestamp:

08/17/2011 09:02:43 PM (14 years ago)

Author:

nacin

Message:

Call _doing_it_wrong() individually in wp_scripts and wp_styles functions. Partially reverts [18556], [18557], removes wp_styles_init(), wp_scripts_init(). fixes #11526.

File:

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

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

@@ -25 +25 @@
 
     global $wp_scripts;
-    if ( !is_a($wp_scripts, 'WP_Scripts') ) {
+    if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
+        if ( ! did_action( 'init' ) )
+            _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+                '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>init</code>' ), '3.3' );
+
         if ( !$handles )
             return array(); // No need to instantiate if nothing is there.
@@ -48 +52 @@
 function wp_register_script( $handle, $src, $deps = array(), $ver = false, $in_footer = false ) {
     global $wp_scripts;
-
-    wp_scripts_init();
+    if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
+        if ( ! did_action( 'init' ) )
+            _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+                '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>init</code>' ), '3.3' );
+        $wp_scripts = new WP_Scripts();
+    }
 
     $wp_scripts->add( $handle, $src, $deps, $ver );
@@ -76 +84 @@
 function wp_localize_script( $handle, $name, $data ) {
     global $wp_scripts;
-
-    wp_scripts_init();
+    if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
+        if ( ! did_action( 'init' ) )
+            _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+                '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>init</code>' ), '3.3' );
+        return false;
+    }
 
     return $wp_scripts->add_script_data( $handle, $name, $data );
@@ -90 +102 @@
 function wp_deregister_script( $handle ) {
     global $wp_scripts;
-
-    wp_scripts_init();
+    if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
+        if ( ! did_action( 'init' ) )
+            _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+                '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>init</code>' ), '3.3' );
+        $wp_scripts = new WP_Scripts();
+    }
 
     $wp_scripts->remove( $handle );
@@ -106 +122 @@
 function wp_enqueue_script( $handle, $src = false, $deps = array(), $ver = false, $in_footer = false ) {
     global $wp_scripts;
-
-    wp_scripts_init();
+    if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
+        if ( ! did_action( 'init' ) )
+            _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+                '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>init</code>' ), '3.3' );
+        $wp_scripts = new WP_Scripts();
+    }
 
     if ( $src ) {
@@ -126 +146 @@
 function wp_dequeue_script( $handle ) {
     global $wp_scripts;
-
-    wp_scripts_init();
+    if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
+        if ( ! did_action( 'init' ) )
+            _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+                '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>init</code>' ), '3.3' );
+        $wp_scripts = new WP_Scripts();
+    }
 
     $wp_scripts->dequeue( $handle );
@@ -146 +170 @@
 function wp_script_is( $handle, $list = 'queue' ) {
     global $wp_scripts;
-
-    wp_scripts_init();
+    if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
+        if ( ! did_action( 'init' ) )
+            _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+                '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>init</code>' ), '3.3' );
+        $wp_scripts = new WP_Scripts();
+    }
 
     $query = $wp_scripts->query( $handle, $list );
@@ -156 +184 @@
     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
-            _doing_it_wrong( __FUNCTION__, __( '$wp_scripts should not be accessed before the "init" hook.' ), '3.3' );
-
-        $wp_scripts = new WP_Scripts();
-        $done = true;
-    }
-}
-