Ticket #37502: 37502.patch

src/wp-includes/general-template.php

@@ -2874 +2874 @@
         foreach ( array( $wp_scripts, $wp_styles ) as $dependencies ) {
                 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 ];
                                 $parsed     = wp_parse_url( $dependency->src );

tests/phpunit/tests/general/resourceHints.php

@@ -163 +163 @@
                 $this->assertEquals( $expected, $actual );
                 $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 );
+        }
 }