Changeset 41718

Timestamp:

10/03/2017 07:26:01 PM (2 years ago)

Author:

flixos90

Message:

Multisite: Use WP_Network_Query in ms_load_current_site_and_network().

This gets rid of the last readonly direct database query for networks in core. 🎉

Props spacedmonkey.
Fixes #41762.

File:

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

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

@@ -269 +269 @@
  * @access private
  *
- * @global wpdb       $wpdb         WordPress database abstraction object.
  * @global WP_Network $current_site The current network.
  * @global WP_Site    $current_blog The current site.
@@ -282 +281 @@
  */
 function ms_load_current_site_and_network( $domain, $path, $subdomain = false ) {
-    global $wpdb, $current_site, $current_blog;
+    global $current_site, $current_blog;
 
     // If the network is defined in wp-config.php, we can simply use that.
@@ -315 +314 @@
         if ( ! $current_site = wp_cache_get( 'current_network', 'site-options' ) ) {
             // Are there even two networks installed?
-            $one_network = $wpdb->get_row( "SELECT * FROM $wpdb->site LIMIT 2" ); // [sic]
-            if ( 1 === $wpdb->num_rows ) {
-                $current_site = new WP_Network( $one_network );
+            $networks = get_networks( array( 'number' => 2 ) );
+            if ( count( $networks ) === 1 ) {
+                $current_site = array_shift( $networks );
                 wp_cache_add( 'current_network', $current_site, 'site-options' );
-            } elseif ( 0 === $wpdb->num_rows ) {
+            } elseif ( empty( $networks ) ) {
                 // A network not found hook should fire here.
                 return false;