Changeset 21166

Timestamp:

06/28/2012 08:18:38 PM (12 years ago)

Author:

nacin

Message:

Allow protocol-relative URLs when registering/enqueueing scripts and styles.

props mimecine, TobiasBg, georgestephanis.
props kurtpayne for the test coverage.
fixes #16560.

Location:

trunk/wp-includes

Files:

• class.wp-scripts.php (modified) (1 diff)
• class.wp-styles.php (modified) (1 diff)

trunk/wp-includes/class.wp-scripts.php

@@ -111 +111 @@
 
         $this->print_extra_script( $handle );
-        if ( !preg_match('|^https?://|', $src) && ! ( $this->content_url && 0 === strpos($src, $this->content_url) ) ) {
+        if ( !preg_match('|^(https?:)?//|', $src) && ! ( $this->content_url && 0 === strpos($src, $this->content_url) ) ) {
             $src = $this->base_url . $src;
         }

trunk/wp-includes/class.wp-styles.php

@@ -136 +136 @@
 
     function _css_href( $src, $ver, $handle ) {
-        if ( !is_bool($src) && !preg_match('|^https?://|', $src) && ! ( $this->content_url && 0 === strpos($src, $this->content_url) ) ) {
+        if ( !is_bool($src) && !preg_match('|^(https?:)?//|', $src) && ! ( $this->content_url && 0 === strpos($src, $this->content_url) ) ) {
             $src = $this->base_url . $src;
         }