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

Timestamp:

10/19/2016 09:28:22 AM (10 years ago)

Author:

swissspidy

Message:

Resource Hints: Allow passing custom attributes to resource hints.

[37920] introduced resource hints that allow browsers to prefetch specific pages or render them in the background. With this change, the as, crossorigin, pr, and type attributes can be passed in addition to the URLs/hosts.

Props peterwilsoncc, swissspidy.
Fixes #38121.

File:

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

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

@@ -2831 +2831 @@
 
         foreach ( $hints as $relation_type => $urls ) {
+                $unique_urls = array();
+
                 /**
                  * Filters domains and URLs for resource hints of relation type.
@@ -2842 +2844 @@
 
                 foreach ( $urls as $key => $url ) {
+                        $atts = array();
+
+                        if ( is_array( $url ) ) {
+                                if ( isset( $url['href'] ) ) {
+                                        $atts = $url;
+                                        $url  = $url['href'];
+                                } else {
+                                        continue;
+                                }
+                        }
+
                         $url = esc_url( $url, array( 'http', 'https' ) );
+
                         if ( ! $url ) {
-                                unset( $urls[ $key ] );
                                 continue;
                         }
 
+                        if ( isset( $unique_urls[ $url ] ) ) {
+                                continue;
+                        }
+
                         if ( in_array( $relation_type, array( 'preconnect', 'dns-prefetch' ) ) ) {
                                 $parsed = wp_parse_url( $url );
+
                                 if ( empty( $parsed['host'] ) ) {
-                                        unset( $urls[ $key ] );
                                         continue;
                                 }
@@ -2863 +2880 @@
                         }
 
-                        $urls[ $key ] = $url;
+                        $atts['rel'] = $relation_type;
+                        $atts['href'] = $url;
+
+                        $unique_urls[ $url ] = $atts;
                 }
 
-                $urls = array_unique( $urls );
-
-                foreach ( $urls as $url ) {
-                        printf( "<link rel='%s' href='%s' />\n", $relation_type, $url );
+                foreach ( $unique_urls as $atts ) {
+                        $html = '';
+
+                        foreach ( $atts as $attr => $value ) {
+                                if ( ! is_scalar( $value ) ||
+                                     ( ! in_array( $attr, array( 'as', 'crossorigin', 'href', 'pr', 'rel', 'type' ), true ) && ! is_numeric( $attr ))
+                                ) {
+                                        continue;
+                                }
+
+                                $value = ( 'href' === $attr ) ? esc_url( $value ) : esc_attr( $value );
+
+                                if ( ! is_string( $attr ) ) {
+                                        $html .= " $value";
+                                } else {
+                                        $html .= " $attr='$value'";
+                                }
+                        }
+
+                        $html = trim( $html );
+
+                        echo "<link $html />\n";
                 }
         }