Changeset 12273

Timestamp:

11/05/2018 08:20:05 PM (6 years ago)

Author:

boonebgorges

Message:

Groups: Improve treatment of single-member groups on user deletion.

Instead of deleting single-member groups on user deletion, we simply
remove the member from the group. Because BuddyPress expects groups to
have at least one admin member, in these cases we assign a site admin
to be the sole group admin.

This changeset also fixes a related bug whereby the group admin/mod
cache was not properly invalidated on membership deletion.

Props djpaul.
Fixes #7476.

Location:

trunk

Files:

• src/bp-groups/bp-groups-cache.php (modified) (1 diff)
• src/bp-groups/classes/class-bp-groups-member.php (modified) (1 diff)
• tests/phpunit/testcases/groups/class-bp-groups-member.php (modified) (1 diff)

trunk/src/bp-groups/bp-groups-cache.php

@@ -213 +213 @@
 }
 add_action( 'groups_member_after_save', 'groups_clear_group_administrator_cache_on_member_save' );
+
+/**
+ * Clear group administrator and moderator cache when a group member is deleted.
+ *
+ * @since 4.0.0
+ *
+ * @param int $user_id  User ID.
+ * @param int $group_id Group ID.
+ */
+function bp_groups_clear_group_administrator_cache_on_member_delete( $user_id, $group_id ) {
+    groups_clear_group_administrator_cache( $group_id );
+}
+add_action( 'bp_groups_member_after_delete', 'bp_groups_clear_group_administrator_cache_on_member_delete', 10, 2 );
 
 /**

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

@@ -1429 +1429 @@
      * Delete all group membership information for the specified user.
      *
+     * In cases where the user is the sole member of a group, a site administrator is
+     * assigned to be the group's administrator. Unhook `groups_remove_data_for_user()`
+     * to modify this behavior.
+     *
      * @since 1.0.0
+     * @since 4.0.0 The method behavior was changed so that single-member groups are not deleted.
      *
      * @param int $user_id ID of the user.
-     * @return mixed
+     * @return bool
      */
     public static function delete_all_for_user( $user_id ) {
-        global $wpdb;
-
-        $bp = buddypress();
-
-        // Get all the group ids for the current user's groups and update counts.
         $group_ids = BP_Groups_Member::get_group_ids( $user_id );
+
         foreach ( $group_ids['groups'] as $group_id ) {
-            groups_update_groupmeta( $group_id, 'total_member_count', groups_get_total_member_count( $group_id ) - 1 );
-
-            // If current user is the creator of a group and is the sole admin, delete that group to avoid counts going out-of-sync.
-            if ( groups_is_user_admin( $user_id, $group_id ) && count( groups_get_group_admins( $group_id ) ) < 2 && groups_is_user_creator( $user_id, $group_id ) )
-                groups_delete_group( $group_id );
-        }
-
-        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d", $user_id ) );
+            if ( groups_is_user_admin( $user_id, $group_id ) ) {
+                // If the user is a sole group admin, install a site admin as their replacement.
+                if ( count( groups_get_group_admins( $group_id ) ) < 2 ) {
+                    $admin = get_users( [
+                        'blog_id' => bp_get_root_blog_id(),
+                        'fields'  => 'id',
+                        'number'  => 1,
+                        'orderby' => 'ID',
+                        'role'    => 'administrator',
+                    ] );
+
+                    if ( ! empty( $admin ) ) {
+                        groups_join_group( $group_id, $admin[0] );
+
+                        $member = new BP_Groups_Member( $admin[0], $group_id );
+                        $member->promote( 'admin' );
+                    }
+                }
+            }
+
+            BP_Groups_Member::delete( $user_id, $group_id );
+        }
+
+        return true;
     }
 }

trunk/tests/phpunit/testcases/groups/class-bp-groups-member.php

@@ -1455 +1455 @@
         $this->assertSame( self::$group_ids[1], $memberships[0]->group_id );
     }
+
+    /**
+     * @ticket BP7476
+     */
+    public function test_delete_all_for_user() {
+        $new_user = self::factory()->user->create();
+
+        $admin_users = get_users( [
+            'blog_id' => bp_get_root_blog_id(),
+            'fields'  => 'id',
+            'number'  => 1,
+            'orderby' => 'ID',
+            'role'    => 'administrator',
+        ] );
+
+        $admin_user = (int) $admin_users[0];
+
+        // Sole admin of group.
+        $new_group = self::factory()->group->create( [
+            'creator_id' => $new_user,
+        ] );
+
+        // One of two group admins.
+        groups_join_group( self::$group_ids[0], $new_user );
+        $m1 = new BP_Groups_Member( $new_user, self::$group_ids[0] );
+        $m1->promote( 'admin' );
+
+        // Not an admin.
+        groups_join_group( self::$group_ids[1], $new_user );
+        $m2 = new BP_Groups_Member( $new_user, self::$group_ids[1] );
+
+        BP_Groups_Member::delete_all_for_user( $new_user );
+
+        $new_group_members = BP_Groups_Member::get_group_administrator_ids( $new_group );
+        $this->assertSame( [ $admin_user ], wp_list_pluck( $new_group_members, 'user_id' ) );
+
+        $g0_members = BP_Groups_Member::get_group_administrator_ids( self::$group_ids[0] );
+        $this->assertSame( [ self::$user_ids[3] ], wp_list_pluck( $g0_members, 'user_id' ) );
+
+        $g1_members = BP_Groups_Member::get_group_administrator_ids( self::$group_ids[1] );
+        $this->assertSame( [ self::$user_ids[3] ], wp_list_pluck( $g1_members, 'user_id' ) );
+    }
 }