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

Timestamp:

03/29/2010 07:57:17 PM (14 years ago)

Author:

wpmuguru

Message:

tweaks to network_*_url(), see #12736

File:

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

trunk/wp-includes/link-template.php

@@ -2035 +2035 @@
 */
 function network_site_url( $path = '', $scheme = null ) {
+    global $current_site;
     $orig_scheme = $scheme;
     if ( !in_array($scheme, array('http', 'https')) ) {
@@ -2052 +2053 @@
 
     if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
-        $url .= '/' . ltrim($path, '/');
+        $url .= ltrim($path, '/');
 
     return apply_filters('network_site_url', $url, $path, $orig_scheme);
@@ -2072 +2073 @@
 */
 function network_home_url( $path = '', $scheme = null ) {
+    global $current_site;
     $orig_scheme = $scheme;
     $scheme      = is_ssl() && !is_admin() ? 'https' : 'http';
@@ -2077 +2079 @@
     $url = 'http://' . $current_site->domain . $current_site->path;
 
-    $url = str_replace( 'http://', "$scheme://", $home );
+    $url = str_replace( 'http://', "$scheme://", $url );
 
     if ( !empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
-        $url .= '/' . ltrim( $path, '/' );
+        $url .= ltrim( $path, '/' );
 
     return apply_filters( 'network_home_url', $url, $path, $orig_scheme);
@@ -2096 +2098 @@
 */
 function network_admin_url( $path = '', $scheme = 'admin' ) {
-    $url = network_site_url($blog_id, 'wp-admin/', $scheme);
+    $url = network_site_url('wp-admin/', $scheme);
 
     if ( !empty($path) && is_string($path) && strpos($path, '..') === false )