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

Timestamp:

09/20/2016 09:38:08 PM (8 years ago)

Author:

jeremyfelt

Message:

Multisite: Revert [38388].

Restore get_current_site() to a multisite only function. Providing this in single site may be a possibility in the future, but should have a dedicated ticket and discussion.

See #37699.

File:

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

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

@@ -3258 +3258 @@
     $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, '/' );
-    }
 
     /**
@@ -3306 +3304 @@
         $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, '/' );
-    }
 
     /**