Changeset 38814 for trunk/src/wp-includes/ms-blogs.php

Timestamp:

10/19/2016 04:46:14 AM (8 years ago)

Author:

jeremyfelt

Message:

Multisite: Use get_network() and get_current_network_id() for current network data.

get_network() falls back to the current network when called without any arguments. Between this and get_current_network_id(), we can replace almost all instances of the global $current_site and all instances of get_current_site().

This effectively deprecates get_current_site(), something that we'll do in a future ticket.

Props flixos90.
Fixes #37414.

File:

• trunk/src/wp-includes/ms-blogs.php (modified) (1 diff)

trunk/src/wp-includes/ms-blogs.php

@@ -82 +82 @@
  */
 function get_id_from_blogname( $slug ) {
-    $current_site = get_current_site();
+    $current_network = get_network();
     $slug = trim( $slug, '/' );
 
     if ( is_subdomain_install() ) {
-        $domain = $slug . '.' . preg_replace( '|^www\.|', '', $current_site->domain );
-        $path = $current_site->path;
+        $domain = $slug . '.' . preg_replace( '|^www\.|', '', $current_network->domain );
+        $path = $current_network->path;
     } else {
-        $domain = $current_site->domain;
-        $path = $current_site->path . $slug . '/';
+        $domain = $current_network->domain;
+        $path = $current_network->path . $slug . '/';
     }