Changeset 21672 for trunk/wp-includes/class.wp-dependencies.php

Timestamp:

08/30/2012 06:57:57 PM (14 years ago)

Author:

nacin

Message:

Have wp_script_is() and wp_style_is() accept 'enqueued', as it reads better than 'queue' and is consistent with 'registered'. fixes #21741.

File:

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

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

@@ -197 +197 @@
         }
 
-        function query( $handle, $list = 'registered' ) { // registered, queue, done, to_do
-                switch ( $list ) :
-                case 'registered':
-                case 'scripts': // back compat
-                        if ( isset($this->registered[$handle]) )
-                                return $this->registered[$handle];
-                        break;
-                case 'to_print': // back compat
-                case 'printed': // back compat
-                        if ( 'to_print' == $list )
-                                $list = 'to_do';
-                        else
-                                $list = 'printed';
-                default:
-                        if ( in_array($handle, $this->$list) )
-                                return true;
-                        break;
-                endswitch;
+
+        function query( $handle, $list = 'registered' ) {
+                switch ( $list ) {
+                        case 'registered' :
+                        case 'scripts': // back compat
+                                if ( isset( $this->registered[ $handle ] ) )
+                                        return $this->registered[ $handle ];
+                                return false;
+
+                        case 'enqueued' :
+                        case 'queue' :
+                                return in_array( $handle, $this->queue );
+
+                        case 'to_do' :
+                        case 'to_print': // back compat
+                                return in_array( $handle, $this->to_do );
+
+                        case 'done' :
+                        case 'printed': // back compat
+                                return in_array( $handle, $this->done );
+                }
                 return false;
         }