Changeset 53011 for trunk/src/wp-includes/ms-functions.php

Timestamp:

03/29/2022 12:41:00 PM (3 years ago)

Author:

spacedmonkey

Message:

Users: Introduce the concept of a large site to single site installations.

Currently in WordPress multisite there is a concept of large networks. The function wp_is_large_network is used to determine if a network has a large number of sites or users. If a network is marked as large, then
expensive queries to calculate user counts are not run on page load but deferred to scheduled events. However there are a number of places in a single site installation where this functionality would also be useful, as
expensive calls to count users and roles can make screens in the admin extremely slow.

In this change, the get_user_count function and related functionality around it is ported to be available in a single site context. This means that expensive calls to the count_users function are replaced with
calls to get_user_count. This change also includes a new function called wp_is_large_user_count and a filter of the same name, to mark if a site is large.

Props johnbillion, Spacedmonkey, Mista-Flo, lumpysimon, tharsheblows, obenland, miss_jwo, jrchamp, flixos90, macbookandrew, pento, desrosj, johnjamesjacoby, jb510, davidbaumwald, costdev.
Fixes #38741.

File:

• trunk/src/wp-includes/ms-functions.php (modified) (4 diffs)

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

@@ -99 +99 @@
         return $primary;
     }
-}
-
-/**
- * The number of active users in your installation.
- *
- * The count is cached and updated twice daily. This is not a live count.
- *
- * @since MU (3.0.0)
- * @since 4.8.0 The `$network_id` parameter has been added.
- *
- * @param int|null $network_id ID of the network. Default is the current network.
- * @return int Number of active users on the network.
- */
-function get_user_count( $network_id = null ) {
-    return get_network_option( $network_id, 'user_count' );
 }
 
@@ -2612 +2597 @@
  * @since 3.7.0
  * @since 4.8.0 The `$network_id` parameter has been added.
- *
- * @global wpdb $wpdb WordPress database abstraction object.
+ * @since 6.0.0 This function is now a wrapper for wp_update_user_counts().
  *
  * @param int|null $network_id ID of the network. Default is the current network.
  */
 function wp_update_network_user_counts( $network_id = null ) {
-    global $wpdb;
-
-    $count = $wpdb->get_var( "SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'" );
-    update_network_option( $network_id, 'user_count', $count );
+    wp_update_user_counts( $network_id );
 }
 
@@ -2755 +2736 @@
     if ( 'users' === $using ) {
         $count = get_user_count( $network_id );
+
+        $is_large_network = wp_is_large_user_count( $network_id );
+
         /**
          * Filters whether the network is considered large.
@@ -2766 +2750 @@
          * @param int    $network_id       The ID of the network being checked.
          */
-        return apply_filters( 'wp_is_large_network', $count > 10000, 'users', $count, $network_id );
+        return apply_filters( 'wp_is_large_network', $is_large_network, 'users', $count, $network_id );
     }