Changeset 8301 for trunk/wp-includes/link-template.php

Timestamp:

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

Author:

ryan

Message:

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

File:

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

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;
+}
+
 ?>