sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Script Loader: Limit resource hinting to enqueued assets.

Browse Source 
Externally hosted script and style dependencies trigger `dns-prefetch` hinting only when enqueued. This removed a bug in which hinting was added on registration.

Renames the function `wp_resource_hints_scripts_styles` to `wp_dependencies_unique_hosts` as the function provides the hosts, not the hinting.

Props swissspidy.
Fixes #37385.


git-svn-id: https://develop.svn.wordpress.org/trunk@38100 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Peter Wilson 2016-07-19 02:34:42 +00:00
parent 103da159d5
commit b92c1c58b3
2 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/wp-includes/general-template.php
View File

@ -2799,7 +2799,7 @@ function wp_site_icon() {
*/
function wp_resource_hints() {
$hints = array(
'dns-prefetch' => wp_resource_hints_scripts_styles(),
'dns-prefetch' => wp_dependencies_unique_hosts(),
'preconnect' => array( 's.w.org' ),
'prefetch' => array(),
'prerender' => array(),
@ -2851,31 +2851,27 @@ function wp_resource_hints() {
}
/**
* Adds dns-prefetch for all scripts and styles enqueued from external hosts.
* Returns a list of unique hosts of all enqueued scripts and styles.
*
* @since 4.6.0
*
* @return array A list of unique hosts of enqueued scripts and styles.
*/
function wp_resource_hints_scripts_styles() {
function wp_dependencies_unique_hosts() {
global $wp_scripts, $wp_styles;
$unique_hosts = array();
if ( is_object( $wp_scripts ) && ! empty( $wp_scripts->registered ) ) {
foreach ( $wp_scripts->registered as $registered_script ) {
$parsed = wp_parse_url( $registered_script->src );
foreach ( array( $wp_scripts, $wp_styles ) as $dependencies ) {
if ( $dependencies instanceof WP_Dependencies && ! empty( $dependencies->queue ) ) {
foreach ( $dependencies->queue as $handle ) {
/* @var _WP_Dependency $dependency */
$dependency = $dependencies->registered[ $handle ];
$parsed = wp_parse_url( $dependency->src );
if ( ! empty( $parsed['host'] ) && ! in_array( $parsed['host'], $unique_hosts ) && $parsed['host'] !== $_SERVER['SERVER_NAME'] ) {
$unique_hosts[] = $parsed['host'];
}
}
}
if ( is_object( $wp_styles ) && ! empty( $wp_styles->registered ) ) {
foreach ( $wp_styles->registered as $registered_style ) {
$parsed = wp_parse_url( $registered_style->src );
if ( ! empty( $parsed['host'] ) && ! in_array( $parsed['host'], $unique_hosts ) && $parsed['host'] !== $_SERVER['SERVER_NAME'] ) {
$unique_hosts[] = $parsed['host'];
if ( ! empty( $parsed['host'] ) && ! in_array( $parsed['host'], $unique_hosts ) && $parsed['host'] !== $_SERVER['SERVER_NAME'] ) {
$unique_hosts[] = $parsed['host'];
}
}
}
}

13
tests/phpunit/tests/general/resourceHints.php
View File

@ -150,4 +150,17 @@ class Tests_WP_Resource_Hints extends WP_UnitTestCase {
$this->assertEquals( $expected, $actual );
}
function test_dns_prefetch_scripts_does_not_included_registered_only() {
$expected = "<link rel='preconnect' href='http://s.w.org'>\n";
$unexpected = "<link rel='dns-prefetch' href='//wordpress.org'>\n";
wp_register_script( 'jquery-elsewhere', 'https://wordpress.org/wp-includes/js/jquery/jquery.js' );
$actual = get_echo( 'wp_resource_hints' );
wp_deregister_script( 'jquery-elsewhere' );
$this->assertEquals( $expected, $actual );
$this->assertNotContains( $unexpected, $actual );
}
}