Changeset 41380 for trunk/src/wp-includes/ms-load.php

Timestamp:

09/15/2017 11:14:49 AM (7 years ago)

Author:

flixos90

Message:

Multisite: Introduce get_main_site_id().

This function can be used to easily get the main site ID of a given network via the optional $network_id parameter, which defaults to the current network. The existing is_main_site() now uses the new function internally and now accepts an optional $network_id parameter as well.

The main purpose of the new function at this point is to ensure that the WP_Network::$blog_id property is always set. Magic getters in the class have been adjusted to auto-fill the property when it is accessed and empty. Furthermore the function encapsulates logic that was previously part of ms_load_current_site_and_network() and has been replaced with a call to the function now.

Props spacedmonkey, jeremyfelt, johnjamesjacoby, flixos90.
Fixes #29684.

File:

• trunk/src/wp-includes/ms-load.php (modified) (2 diffs)

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

@@ -136 +136 @@
 /**
  * Retrieves the closest matching site object by its domain and path.
- * 
+ *
  * This will not necessarily return an exact match for a domain and path. Instead, it
  * breaks the domain and path into pieces that are then used to match the closest
@@ -425 +425 @@
     // Figure out the current network's main site.
     if ( empty( $current_site->blog_id ) ) {
-        if ( $current_blog->domain === $current_site->domain && $current_blog->path === $current_site->path ) {
-            $current_site->blog_id = $current_blog->blog_id;
-        } elseif ( ! $current_site->blog_id = wp_cache_get( 'network:' . $current_site->id . ':main_site', 'site-options' ) ) {
-            $current_site->blog_id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s",
-                $current_site->domain, $current_site->path ) );
-            wp_cache_add( 'network:' . $current_site->id . ':main_site', $current_site->blog_id, 'site-options' );
-        }
+        $current_site->blog_id = get_main_site_id( $current_site->id );
     }