Changeset 8301

Timestamp:

07/09/2008 05:24:36 PM (18 years ago)

Author:

ryan

Message:

Introduce content_url(). Don't prepend base url to content url in script loader. see #6938 #7001

Location:

trunk/wp-includes

Files:

• class.wp-scripts.php (modified) (1 diff)
• class.wp-styles.php (modified) (1 diff)
• link-template.php (modified) (3 diffs)
• theme.php (modified) (1 diff)

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

@@ -51 +51 @@
 
                 $src = $this->registered[$handle]->src;
-                if ( !preg_match('|^https?://|', $src) ) {
+                if ( !preg_match('|^https?://|', $src) && !preg_match('|^' . preg_quote(WP_CONTENT_URL) . '|', $src) ) {
                         $src = $this->base_url . $src;
                 }

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

@@ -60 +60 @@
 
         function _css_href( $src, $ver, $handle ) {
-                if ( !preg_match('|^https?://|', $src) ) {
+                if ( !preg_match('|^https?://|', $src) && !preg_match('|^' . preg_quote(WP_CONTENT_URL) . '|', $src) ) {
                         $src = $this->base_url . $src;
                 }

trunk/wp-includes/link-template.php

@@ -801 +801 @@
 
 function admin_url($path = '') {
-        global $_wp_admin_url;
-
         $url = site_url('wp-admin/', 'admin');
 
@@ -812 +810 @@
 
 function includes_url($path = '') {
-        global $_wp_includes_url;
-
         $url = site_url() . '/' . WPINC . '/';
 
@@ -822 +818 @@
 }
 
+function content_url($path = '') {
+        $scheme = ( is_ssl() ? 'https' : 'http' );
+        $url = WP_CONTENT_URL;
+        if ( 0 === strpos($url, 'http') ) {
+                if ( is_ssl() )
+                        $url = str_replace( 'http://', "{$scheme}://", $url );
+        }
+
+        if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
+                $url .= '/' . ltrim($path, '/');
+
+        return $url;
+}
+
 ?>

trunk/wp-includes/theme.php

@@ -338 +338 @@
 
 function get_theme_root_uri() {
-        return apply_filters('theme_root_uri', WP_CONTENT_URL . "/themes", get_option('siteurl'));
+        return apply_filters('theme_root_uri', content_url('themes'), get_option('siteurl'));
 }