Changeset 38388 for trunk/src/wp-includes/link-template.php

Timestamp:

08/26/2016 09:34:36 PM (8 years ago)

Author:

wonderboymusic

Message:

Multisite: move get_current_site() to load.php so that it can be used in more places, instead of importing global $current_site.

See #37699.

File:

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

trunk/src/wp-includes/link-template.php

@@ -3264 +3264 @@
     $current_site = get_current_site();
 
-    if ( 'relative' == $scheme )
+    if ( 'relative' == $scheme ) {
         $url = $current_site->path;
-    else
+    } else {
         $url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
-
-    if ( $path && is_string( $path ) )
+    }
+
+    if ( $path && is_string( $path ) ) {
         $url .= ltrim( $path, '/' );
+    }
 
     /**
@@ -3310 +3312 @@
         $scheme = is_ssl() && ! is_admin() ? 'https' : 'http';
 
-    if ( 'relative' == $scheme )
+    if ( 'relative' == $scheme ) {
         $url = $current_site->path;
-    else
+    } else {
         $url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
-
-    if ( $path && is_string( $path ) )
+    }
+
+    if ( $path && is_string( $path ) ) {
         $url .= ltrim( $path, '/' );
+    }
 
     /**