Changeset 38256 for branches/4.6/src/wp-includes/general-template.php

Timestamp:

08/13/2016 06:39:39 PM (8 years ago)

Author:

ocean90

Message:

Script Loader: Fix protocol-relative URLs for the preconnect relation type.

wp_resource_hints() parses the URL for the preconnect and dns-prefetch relation types to ensure correct values for both. While protocol-relative URLs are supported for dns-prefetch, the double slash was lost for preconnect.

Merge of [38255] to the 4.6 branch.

Props swissspidy, peterwilsoncc.
Props azaozz for review.
See #37652.

Location:

branches/4.6

Files:

• . (modified) (1 prop)
• src/wp-includes/general-template.php (modified) (1 diff)

branches/4.6/src/wp-includes/general-template.php

@@ -2840 +2840 @@
                 }
 
-                if ( 'dns-prefetch' === $relation_type ) {
-                    $url = '//' . $parsed['host'];
-                } else if ( ! empty( $parsed['scheme'] ) ) {
+                if ( 'preconnect' === $relation_type && ! empty( $parsed['scheme'] ) ) {
                     $url = $parsed['scheme'] . '://' . $parsed['host'];
                 } else {
-                    $url = $parsed['host'];
+                    // Use protocol-relative URLs for dns-prefetch or if scheme is missing.
+                    $url = '//' . $parsed['host'];
                 }
             }