Changeset 37922

Timestamp:

06/29/2016 09:04:25 PM (10 years ago)

Author:

ocean90

Message:

Script Loader: Use wp_parse_url() to fix URL parsing failures for PHP < 5.4.7.

See [37920].
See #34292.

File:

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

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

@@ -2822 +2822 @@
 
                         if ( in_array( $relation_type, array( 'preconnect', 'dns-prefetch' ) ) ) {
-                                $parsed = parse_url( $url );
+                                $parsed = wp_parse_url( $url );
+                                if ( empty( $parsed['host'] ) ) {
+                                        continue;
+                                }
 
                                 if ( ! empty( $parsed['scheme'] ) ) {
@@ -2848 +2851 @@
         if ( is_object( $wp_scripts ) && ! empty( $wp_scripts->registered ) ) {
                 foreach ( $wp_scripts->registered as $registered_script ) {
-                        $src = $registered_script->src;
-                        // Make sure the URL has a scheme, otherwise parse_url() could fail to pass the host.
-                        if ( '//' == substr( $src, 0, 2 ) ) {
-                                $src = set_url_scheme( $src );
-                        }
-
-                        $this_host = parse_url( $src, PHP_URL_HOST );
-                        if ( ! empty( $this_host ) && ! in_array( $this_host, $unique_hosts ) && $this_host !== $_SERVER['SERVER_NAME'] ) {
-                                $unique_hosts[] = $this_host;
+                        $parsed = wp_parse_url( $registered_script->src );
+
+                        if ( ! empty( $parsed['host'] ) && ! in_array( $parsed['host'], $unique_hosts ) && $parsed['host'] !== $_SERVER['SERVER_NAME'] ) {
+                                $unique_hosts[] = $parsed['host'];
                         }
                 }
@@ -2863 +2861 @@
         if ( is_object( $wp_styles ) && ! empty( $wp_styles->registered ) ) {
                 foreach ( $wp_styles->registered as $registered_style ) {
-                        $src = $registered_style->src;
-                        // Make sure the URL has a scheme, otherwise parse_url() could fail to pass the host.
-                        if ( '//' == substr( $src, 0, 2 ) ) {
-                                $src = set_url_scheme( $src );
-                        }
-
-                        $this_host = parse_url( $src, PHP_URL_HOST );
-                        if ( ! empty( $this_host ) && ! in_array( $this_host, $unique_hosts ) && $this_host !== $_SERVER['SERVER_NAME'] ) {
-                                $unique_hosts[] = $this_host;
+                        $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'];
                         }
                 }