Changeset 38174

Timestamp:

07/31/2016 06:24:21 PM (9 years ago)

Author:

ocean90

Message:

Script Loader: Ignore deregistered dependencies in wp_dependencies_unique_hosts().

Prevents a PHP warning when a handle of a deregistered dependency is still in the queue.

Fixes #37502.

Location:

trunk

Files:

• src/wp-includes/general-template.php (modified) (1 diff)
• tests/phpunit/tests/general/resourceHints.php (modified) (1 diff)

trunk/src/wp-includes/general-template.php

@@ -2875 +2875 @@
         if ( $dependencies instanceof WP_Dependencies && ! empty( $dependencies->queue ) ) {
             foreach ( $dependencies->queue as $handle ) {
+                if ( ! isset( $dependencies->registered[ $handle ] ) ) {
+                    continue;
+                }
+
                 /* @var _WP_Dependency $dependency */
                 $dependency = $dependencies->registered[ $handle ];

trunk/tests/phpunit/tests/general/resourceHints.php

@@ -164 +164 @@
         $this->assertNotContains( $unexpected, $actual );
     }
+
+    /**
+     * @ticket 37502
+     */
+    function test_deregistered_scripts_are_ignored() {
+        $expected = "<link rel='dns-prefetch' href='//s.w.org'>\n";
+
+        wp_enqueue_script( 'test-script', 'http://example.org/script.js' );
+        wp_deregister_script( 'test-script' );
+
+        $actual = get_echo( 'wp_resource_hints' );
+        $this->assertEquals( $expected, $actual );
+    }
 }