Ticket #38741: 38741.6.diff

src/wp-admin/includes/class-wp-users-list-table.php

@@ -166 +166 @@
                 global $role;
 
                 $wp_roles = wp_roles();
+                $count_users = true;
+
+                if ( wp_is_large_user_count() ) {
+                        $count_users = false;
+                } elseif ( is_multisite() && wp_is_large_network( 'users' ) ) {
+                        $count_users = false;
+                }
 
                 if ( $this->is_site_users ) {
                         $url = 'site-users.php?id=' . $this->site_id;
-                        switch_to_blog( $this->site_id );
-                        $users_of_blog = count_users( 'time', $this->site_id );
-                        restore_current_blog();
+                        if ( $count_users ) {
+                                switch_to_blog( $this->site_id );
+                                $users_of_blog = count_users( 'time', $this->site_id );
+                                restore_current_blog();
+                        }
                 } else {
                         $url = 'users.php';
-                        $users_of_blog = count_users();
+                        if ( $count_users ) {
+                                $users_of_blog = count_users();
+                        }
                 }
 
-                $total_users = $users_of_blog['total_users'];
-                $avail_roles =& $users_of_blog['avail_roles'];
-                unset($users_of_blog);
+                if ( $count_users ) {
+                        $total_users = $users_of_blog['total_users'];
+                        $avail_roles =& $users_of_blog['avail_roles'];
+                        unset($users_of_blog);
+                } else {
+                        $avail_roles = array();
+                }
 
                 $class = empty($role) ? ' class="current"' : '';
                 $role_links = array();
-                $role_links['all'] = "<a href='$url'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
+
+                if ( $count_users ) {
+                        $role_links['all'] = "<a href='$url'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
+                } else {
+                        $role_links['all'] = "<a href='$url'$class>" . _x( 'All', 'users' ) . '</a>';
+                }
                 foreach ( $wp_roles->get_names() as $this_role => $name ) {
-                        if ( !isset($avail_roles[$this_role]) )
+                        if ( $count_users && !isset($avail_roles[$this_role]) ) {
                                 continue;
+                        }
 
                         $class = '';
 
@@ -195 +216 @@
                         }
 
                         $name = translate_user_role( $name );
-                        /* translators: User role name with count */
-                        $name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n( $avail_roles[$this_role] ) );
+                        if ( $count_users ) {
+                                /* translators: User role name with count */
+                                $name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n( $avail_roles[$this_role] ) );
+                        }
                         $role_links[$this_role] = "<a href='" . esc_url( add_query_arg( 'role', $this_role, $url ) ) . "'$class>$name</a>";
                 }
 
-                if ( ! empty( $avail_roles['none' ] ) ) {
+                if ( ! $count_users || ! empty( $avail_roles['none' ] ) ) {
 
                         $class = '';
 
@@ -209 +232 @@
                         }
 
                         $name = __( 'No role' );
-                        /* translators: User role name with count */
-                        $name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n( $avail_roles['none' ] ) );
+                        if ( $count_users ) {
+                                /* translators: User role name with count */
+                                $name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n( $avail_roles['none' ] ) );
+                        }
                         $role_links['none'] = "<a href='" . esc_url( add_query_arg( 'role', 'none', $url ) ) . "'$class>$name</a>";
 
                 }

src/wp-includes/default-filters.php

@@ -464 +464 @@
 // Widgets
 add_action( 'init', 'wp_widgets_init', 1 );
 
+// User counts
+foreach ( array( 'user_register', 'deleted_user' ) as $action ){
+        add_action( $action, 'wp_update_active_user_count' );
+}
+
 // Admin Bar
 // Don't remove. Wrong way to disable.
 add_action( 'template_redirect', '_wp_admin_bar_init', 0 );

src/wp-includes/functions.php

@@ -5734 +5734 @@
                 $site_name
         ), $email_change_email['message'], $email_change_email['headers'] );
 }
+
+/**
+ * Whether or not we have a large site, based on its number of users.
+ *
+ * The default criteria for a large site is more than 10,000 users.
+ *
+ * @since x.x.x
+ *
+ * @return bool True if the site meets the criteria for large. False otherwise.
+ */
+function wp_is_large_user_count() {
+        $count = wp_get_active_user_count();
+return true;
+        /**
+         * Filters whether the site is considered large, based on its number of users.
+         *
+         * @since x.x.x
+         *
+         * @param bool   $is_large_user_count Whether the site has more than 10000 users.
+         * @param int    $count         The count of items for the component.
+         */
+        return apply_filters( 'wp_is_large_user_count', $count > 10000, $count );
+}
+
+/**
+ * Update the active user count.
+ *
+ * @since x.x.x
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @return int The active user count.
+ */
+function wp_update_active_user_count() {
+        global $wpdb;
+
+        $count = $wpdb->get_var( "
+                SELECT COUNT(ID) as c
+                FROM $wpdb->users
+        " );
+        update_option( 'active_user_count', $count );
+
+        return (int) $count;
+}
+
+/**
+ * The number of active users.
+ *
+ * @since x.x.x
+ *
+ * @return int The active user count.
+ */
+function wp_get_active_user_count() {
+        $count = get_option( 'active_user_count', false );
+
+        if ( false === $count ) {
+                $count = wp_update_active_user_count();
+        }
+        return (int) $count;
+}

src/wp-includes/ms-functions.php

@@ -2550 +2550 @@
 
         if ( 'users' == $using ) {
                 $count = get_user_count( $network_id );
+                $is_large = ( $count > 10000 );
+
+                /** This filter is documented in wp-includes/functions.php */
+                $is_large = apply_filters( 'wp_is_large_user_count', $is_large, $count );
+
                 /**
                  * Filters whether the network is considered large.
                  *
@@ -2561 +2566 @@
                  * @param int    $count            The count of items for the component.
                  * @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, 'users', $count, $network_id );
         }
 
         $count = get_blog_count( $network_id );

src/wp-includes/update.php

@@ -78 +78 @@
                 $wp_install = network_site_url();
                 $multisite_enabled = 1;
         } else {
-                $user_count = count_users();
-                $user_count = $user_count['total_users'];
+                $user_count = wp_get_active_user_count();
                 $multisite_enabled = 0;
                 $num_blogs = 1;
                 $wp_install = home_url( '/' );

tests/phpunit/tests/functions.php

@@ -1110 +1110 @@
 
                 return $data;
         }
+
+        /*
+         * @ticket 38741
+         */
+        
+        public function test_wp_get_active_user_count(){
+
+                // make twenty additional users to make 21 users
+                for( $i = 0; $i < 20; $i++ ){
+                        self::factory()->user->create();
+                }
+
+                $user_count = wp_get_active_user_count();
+
+                $this->assertEquals( $user_count, 21 );
+        }
+
+        /*
+         * @ticket 38741
+         */
+        public function test_wp_is_large_user_count(){
+
+                if ( wp_using_ext_object_cache() ) {
+                        $this->markTestSkipped( 'Not testable with an external object cache.' );
+                }
+
+                // set the 'active_user_count' transient to over 10000 to emulate a large site
+                update_option( 'active_user_count', 10001 );
+                $this->assertTrue( wp_is_large_user_count() );
+                delete_option( 'active_user_count' );
+        }
 }