Changeset 5987

Timestamp:

04/13/2012 04:31:51 PM (12 years ago)

Author:

boonebgorges

Message:

'Total member count' cleanup:

• Introduces bp_core_get_active_member_count() to get an accurate count of members with recorded last_activity
• Points bp_get_total_member_count() to bp_core_get_active_member_count(), so that 'All Members' tab count on member directories matches the total count prepared by BP_Core_User::get_users(). Fixes #4061
• Changes 'All Members' count in activity/index.php to use bp_get_total_member_count(), for greater accuracy and consistency between activity and members components
• Introduces a cache-busting function to be fired when member counts change (new members, spam status changed, member deleted)

Location:

trunk

Files:

• bp-core/bp-core-cache.php (modified) (1 diff)
• bp-core/bp-core-template.php (modified) (1 diff)
• bp-members/bp-members-functions.php (modified) (4 diffs)
• bp-themes/bp-default/activity/index.php (modified) (2 diffs)

trunk/bp-core/bp-core-cache.php

@@ -44 +44 @@
     wp_cache_delete( 'bp_user_' . $user_id, 'bp' );
 }
+
+/**
+ * Clears member count caches and transients
+ */
+function bp_core_clear_member_count_caches() {
+    wp_cache_delete( 'bp_total_member_count', 'bp' );
+    delete_transient( 'bp_active_member_count' );
+}
+add_action( 'bp_core_activated_user',         'bp_core_clear_member_count_caches' );
+add_action( 'bp_core_process_spammer_status', 'bp_core_clear_member_count_caches' );
+add_action( 'bp_core_deleted_account',        'bp_core_clear_member_count_caches' );
 
 /**

trunk/bp-core/bp-core-template.php

@@ -503 +503 @@
 add_filter( 'bp_create_excerpt', 'force_balance_tags' );
 
+/**
+ * Echoes the output of bp_get_total_member_count()
+ */
 function bp_total_member_count() {
     echo bp_get_total_member_count();
 }
+    /**
+     * Returns the total member count in your BP instance
+     *
+     * Since BuddyPress 1.6, this function has used bp_core_get_active_member_count(), which
+     * counts non-spam, non-deleted users who have last_activity. This value will correctly
+     * match the total member count number used for pagination on member directories.
+     *
+     * Before BuddyPress 1.6, this function used bp_core_get_total_member_count(), which did
+     * not take into account last_activity, and thus often resulted in higher counts than
+     * shown by member directory pagination.
+     */
     function bp_get_total_member_count() {
-        return apply_filters( 'bp_get_total_member_count', bp_core_get_total_member_count() );
+        return apply_filters( 'bp_get_total_member_count', bp_core_get_active_member_count() );
     }
     add_filter( 'bp_get_total_member_count', 'bp_core_number_format' );

trunk/bp-members/bp-members-functions.php

@@ -487 +487 @@
 
 /**
+ * Returns the total number of members, limited to those members with last_activity
+ *
+ * @return int The number of active members
+ */
+function bp_core_get_active_member_count() {
+    global $wpdb;
+
+    if ( !$count = get_transient( 'bp_active_member_count' ) ) {
+        // Avoid a costly join by splitting the lookup
+        if ( is_multisite() ) {
+            $sql = $wpdb->prepare( "SELECT ID FROM $wpdb->users WHERE (user_status != 0 OR deleted != 0 OR user_status != 0)" );
+        } else {
+            $sql = $wpdb->prepare( "SELECT ID FROM $wpdb->users WHERE user_status != 0" );
+        }
+
+        $exclude_users = $wpdb->get_col( $sql );
+        $exclude_users_sql = !empty( $exclude_users ) ? $wpdb->prepare( "AND user_id NOT IN (" . implode( ',', wp_parse_id_list( $exclude_users ) ) . ")" ) : '';
+
+        $count = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(user_id) FROM $wpdb->usermeta WHERE meta_key = 'last_activity' {$exclude_users_sql}" ) );
+        set_transient( 'bp_active_member_count', $count );
+    }
+
+    return apply_filters( 'bp_core_get_active_member_count', $count );
+}
+
+/**
  * Processes a spammed or unspammed user
  *
@@ -768 +794 @@
         return false;
 
+    do_action( 'bp_core_pre_delete_account', $user_id );
+
     // Specifically handle multi-site environment
     if ( is_multisite() ) {
@@ -773 +801 @@
         require( ABSPATH . '/wp-admin/includes/user.php' );
 
-        return wpmu_delete_user( $user_id );
+        $retval = wpmu_delete_user( $user_id );
 
     // Single site user deletion
     } else {
         require( ABSPATH . '/wp-admin/includes/user.php' );
-        return wp_delete_user( $user_id );
-    }
+        $retval = wp_delete_user( $user_id );
+    }
+
+    do_action( 'bp_core_deleted_account', $user_id );
+
+    return $retval;
 }
 
@@ -1149 +1181 @@
         $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->users SET user_pass = %s WHERE ID = %d", $user['meta']['password'], $user_id ) );
 
-    // Delete the total member cache
-    wp_cache_delete( 'bp_total_member_count', 'bp' );
-
     do_action( 'bp_core_activated_user', $user_id, $key, $user );
 

trunk/bp-themes/bp-default/activity/index.php

@@ -37 +37 @@
                     <?php do_action( 'bp_before_activity_type_tab_all' ); ?>
 
-                    <li class="selected" id="activity-all"><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_activity_slug() ); ?>" title="<?php _e( 'The public activity for everyone on this site.', 'buddypress' ); ?>"><?php printf( __( 'All Members <span>%s</span>', 'buddypress' ), bp_get_total_site_member_count() ); ?></a></li>
+                    <li class="selected" id="activity-all"><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_activity_slug() ); ?>" title="<?php _e( 'The public activity for everyone on this site.', 'buddypress' ); ?>"><?php printf( __( 'All Members <span>%s</span>', 'buddypress' ), bp_get_total_member_count() ); ?></a></li>
 
                     <?php if ( is_user_logged_in() ) : ?>
@@ -90 +90 @@
 
                     <li id="activity-filter-select" class="last">
-                        <label for="activity-filter-by"><?php _e( 'Show:', 'buddypress' ); ?></label> 
+                        <label for="activity-filter-by"><?php _e( 'Show:', 'buddypress' ); ?></label>
                         <select id="activity-filter-by">
                             <option value="-1"><?php _e( 'Everything', 'buddypress' ); ?></option>