Changeset 38036 for trunk/src/wp-includes/general-template.php

Timestamp:

07/12/2016 11:31:58 AM (8 years ago)

Author:

ocean90

Message:

Resource Hints: Remove schemes from dns-prefetch resource hint outputs.

"wordpress.org", "http://wordpress.org", and "https://wordpress.org" should all have the same DNS lookup.
Also, replace \r\n with \n and ensure that invalid URLs are skipped.

Props niallkennedy, peterwilsoncc.
Fixes #37240.

File:

• trunk/src/wp-includes/general-template.php (modified) (2 diffs)

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

@@ -2816 +2816 @@
          */
         $urls = apply_filters( 'wp_resource_hints', $urls, $relation_type );
-        $urls = array_unique( $urls );
-
-        foreach ( $urls as $url ) {
+
+        foreach ( $urls as $key => $url ) {
             $url = esc_url( $url, array( 'http', 'https' ) );
+            if ( ! $url ) {
+                unset( $urls[ $key ] );
+                continue;
+            }
 
             if ( in_array( $relation_type, array( 'preconnect', 'dns-prefetch' ) ) ) {
                 $parsed = wp_parse_url( $url );
                 if ( empty( $parsed['host'] ) ) {
+                    unset( $urls[ $key ] );
                     continue;
                 }
 
-                if ( ! empty( $parsed['scheme'] ) ) {
+                if ( 'dns-prefetch' === $relation_type ) {
+                    $url = '//' . $parsed['host'];
+                } else if ( ! empty( $parsed['scheme'] ) ) {
                     $url = $parsed['scheme'] . '://' . $parsed['host'];
                 } else {
@@ -2834 +2840 @@
             }
 
-            printf( "<link rel='%s' href='%s'>\r\n", $relation_type, $url );
+            $urls[ $key ] = $url;
+        }
+
+        $urls = array_unique( $urls );
+
+        foreach ( $urls as $url ) {
+            printf( "<link rel='%s' href='%s'>\n", $relation_type, $url );
         }
     }