Changeset 13357 for trunk/src/bp-groups/classes/class-bp-group-member-query.php

Timestamp:

11/07/2022 08:32:51 PM (2 years ago)

Author:

imath

Message:

Eventually include inactive users in group's members count

When the Community Site Administrator decides to add an inactive user
as a member of a group from the Group's WP Admin screen, we need to
include them into the group's members count to remain consistent with the
fact:

• an activity is created inside the group to inform this inactive user

joined the group

• the group's members list is including this user.

Props dcavins, sjregan, espellcaste

Closes ​https://github.com/buddypress/buddypress/pull/33
Fixes #7614

File:

• trunk/src/bp-groups/classes/class-bp-group-member-query.php (modified) (2 diffs)

trunk/src/bp-groups/classes/class-bp-group-member-query.php

@@ -548 +548 @@
      *
      * @since 10.3.0
+     * @since 11.0.0 Include inactive users added by a community administrators to the group members count.
      */
     public function populate_extras() {
@@ -555 +556 @@
 
         // Validate active users.
-        $active_users    = array_filter( BP_Core_User::get_last_activity( $this->user_ids ) );
-        $active_user_ids = array_keys( $active_users );
-        $this->results   = array_intersect( $this->user_ids, $active_user_ids );
+        if ( ! bp_current_user_can( 'bp_moderate' ) ) {
+            $active_users    = array_filter( BP_Core_User::get_last_activity( $this->user_ids ) );
+            $active_user_ids = array_keys( $active_users );
+            $this->results   = array_intersect( $this->user_ids, $active_user_ids );
+        } else {
+            $this->results = $this->user_ids;
+        }
 
         // Set the total active users.