Changeset 8301
- Timestamp:
- 07/09/2008 05:24:36 PM (17 years ago)
- Location:
- trunk/wp-includes
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-includes/class.wp-scripts.php
r7976 r8301 51 51 52 52 $src = $this->registered[$handle]->src; 53 if ( !preg_match('|^https?://|', $src) ) {53 if ( !preg_match('|^https?://|', $src) && !preg_match('|^' . preg_quote(WP_CONTENT_URL) . '|', $src) ) { 54 54 $src = $this->base_url . $src; 55 55 } -
trunk/wp-includes/class.wp-styles.php
r7976 r8301 60 60 61 61 function _css_href( $src, $ver, $handle ) { 62 if ( !preg_match('|^https?://|', $src) ) {62 if ( !preg_match('|^https?://|', $src) && !preg_match('|^' . preg_quote(WP_CONTENT_URL) . '|', $src) ) { 63 63 $src = $this->base_url . $src; 64 64 } -
trunk/wp-includes/link-template.php
r8197 r8301 801 801 802 802 function admin_url($path = '') { 803 global $_wp_admin_url;804 805 803 $url = site_url('wp-admin/', 'admin'); 806 804 … … 812 810 813 811 function includes_url($path = '') { 814 global $_wp_includes_url;815 816 812 $url = site_url() . '/' . WPINC . '/'; 817 813 … … 822 818 } 823 819 820 function content_url($path = '') { 821 $scheme = ( is_ssl() ? 'https' : 'http' ); 822 $url = WP_CONTENT_URL; 823 if ( 0 === strpos($url, 'http') ) { 824 if ( is_ssl() ) 825 $url = str_replace( 'http://', "{$scheme}://", $url ); 826 } 827 828 if ( !empty($path) && is_string($path) && strpos($path, '..') === false ) 829 $url .= '/' . ltrim($path, '/'); 830 831 return $url; 832 } 833 824 834 ?> -
trunk/wp-includes/theme.php
r8252 r8301 338 338 339 339 function get_theme_root_uri() { 340 return apply_filters('theme_root_uri', WP_CONTENT_URL . "/themes", get_option('siteurl'));340 return apply_filters('theme_root_uri', content_url('themes'), get_option('siteurl')); 341 341 } 342 342
Note: See TracChangeset
for help on using the changeset viewer.