Ticket #20513: 20513.diff

functions.wp-scripts.php

@@ -23 +23 @@
         if ( '' === $handles ) // for wp_head
                 $handles = false;
 
+        if ( !$handles )
+                return array(); // No need to instantiate if nothing is there.
+
         global $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' );
+        $wp_scripts = wp_scripts_maybe_initialize( $wp_scripts );
 
-                if ( !$handles )
-                        return array(); // No need to instantiate if nothing is there.
-                else
-                        $wp_scripts = new WP_Scripts();
-        }
-
         return $wp_scripts->do_items( $handles );
 }
 
@@ -51 +45 @@
  */
 function wp_register_script( $handle, $src, $deps = array(), $ver = false, $in_footer = false ) {
         global $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' );
-                $wp_scripts = new WP_Scripts();
-        }
-
+        $wp_scripts = wp_scripts_maybe_initialize( $wp_scripts );
         $wp_scripts->add( $handle, $src, $deps, $ver );
         if ( $in_footer )
                 $wp_scripts->add_data( $handle, 'group', 1 );
@@ -85 +73 @@
  */
 function wp_localize_script( $handle, $object_name, $l10n ) {
         global $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 ( ! wp_scripts_maybe_initialize( $wp_scripts, false ) )
                 return false;
-        }
 
         return $wp_scripts->localize( $handle, $object_name, $l10n );
 }
@@ -104 +87 @@
  */
 function wp_deregister_script( $handle ) {
         global $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' );
-                $wp_scripts = new WP_Scripts();
-        }
-
+        $wp_scripts = wp_scripts_maybe_initialize( $wp_scripts );
         $wp_scripts->remove( $handle );
 }
 
@@ -124 +101 @@
  */
 function wp_enqueue_script( $handle, $src = false, $deps = array(), $ver = false, $in_footer = false ) {
         global $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' );
-                $wp_scripts = new WP_Scripts();
-        }
+        $wp_scripts = wp_scripts_maybe_initialize( $wp_scripts );
 
         if ( $src ) {
                 $_handle = explode('?', $handle);
@@ -148 +120 @@
  */
 function wp_dequeue_script( $handle ) {
         global $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' );
-                $wp_scripts = new WP_Scripts();
-        }
-
+        $wp_scripts = wp_scripts_maybe_initialize( $wp_scripts );
         $wp_scripts->dequeue( $handle );
 }
 
@@ -172 +138 @@
  */
 function wp_script_is( $handle, $list = 'queue' ) {
         global $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' );
-                $wp_scripts = new WP_Scripts();
-        }
+        $wp_scripts = wp_scripts_maybe_initialize( $wp_scripts );
 
         $query = $wp_scripts->query( $handle, $list );
 
@@ -186 +147 @@
 
         return $query;
 }
+
+/**
+ * Checks if first argument is an instance of WP_Scripts and optionally creates
+ * and returns it, or returns a fallback.
+ *
+ * @since 3.5.0
+ *
+ * @param string $wp_scripts Variable to test.
+ * @param mixed  $fallback   Optional. What to return - if the default string
+ *                           'WP_Scripts' then an instance of the class is returned.
+ *
+ * @return WP_Scripts|mixed
+ */
+function wp_scripts_maybe_initialize( $wp_scripts, $fallback = '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 ( 'WP_Scripts' == $fallback )
+                        return new WP_Scripts();
+
+                return $fallback;
+        }
+        return $wp_scripts;
+}