Changeset 29252

Timestamp:

07/20/2014 12:28:57 AM (12 years ago)

Author:

wonderboymusic

Message:

wp_script_is( ..., 'enqueued' ) needs to check dependencies recursively - a single item's dependencies may only be a subset of the full dependency tree. Adds a new method on WP_Dependencies called ->recurse_deps().

Adds unit test.

Props wonderboymusic, SergeyBiryukov, mikejolley.
Fixes #28404.

Location:

trunk

Files:

• src/wp-includes/class.wp-dependencies.php (modified) (2 diffs)
• tests/phpunit/tests/dependencies/jquery.php (modified) (1 diff)

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

@@ -326 +326 @@
 
         /**
+         * Recursively search the passed dependency tree for $handle
+         *
+         * @since 4.0.0
+         *
+         * @param array  $queue  An array of queued _WP_Dependency handle objects.
+         * @param string $handle Name of the item. Should be unique.
+         * @return boolean Whether the handle is found after recursively searching the dependency tree.
+         */
+        protected function recurse_deps( $queue, $handle ) {
+                foreach ( $queue as $queued ) {
+                        if ( ! isset( $this->registered[ $queued ] ) ) {
+                                continue;
+                        }
+
+                        if ( in_array( $handle, $this->registered[ $queued ]->deps ) ) {
+                                return true;
+                        } else {
+                                return $this->recurse_deps( $this->registered[ $queued ]->deps, $handle );
+                        }
+                }
+
+                return false;
+        }
+
+        /**
          * Query list for an item.
          *
@@ -345 +370 @@
                         case 'enqueued' :
                         case 'queue' :
-                                return in_array( $handle, $this->queue );
+                                if ( in_array( $handle, $this->queue ) ) {
+                                        return true;
+                                }
+                                return $this->recurse_deps( $this->queue, $handle );
 
                         case 'to_do' :

trunk/tests/phpunit/tests/dependencies/jquery.php

@@ -70 +70 @@
                 $this->assertFalse( strpos( $contents, 'sourceMappingURL' ), 'Presence of sourceMappingURL' );
         }
+
+        /**
+         * @ticket 28404
+         */
+        function test_wp_script_is_dep_enqueued() {
+                wp_enqueue_script( 'jquery-ui-accordion' );
+
+                $this->assertTrue( wp_script_is( 'jquery', 'enqueued' ) );
+                $this->assertFalse( wp_script_is( 'underscore', 'enqueued' ) );
+
+                unset( $GLOBALS['wp_scripts'] );
+        }
 }