<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][12273] trunk: Groups: Improve treatment of single-member groups on user deletion.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/12273">12273</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12273","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-11-05 20:20:05 +0000 (Mon, 05 Nov 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="http://buddypress.trac.wordpress.org/ticket/7476">#7476</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpgroupsbpgroupscachephp">trunk/src/bp-groups/bp-groups-cache.php</a></li>
<li><a href="#trunksrcbpgroupsclassesclassbpgroupsmemberphp">trunk/src/bp-groups/classes/class-bp-groups-member.php</a></li>
<li><a href="#trunktestsphpunittestcasesgroupsclassbpgroupsmemberphp">trunk/tests/phpunit/testcases/groups/class-bp-groups-member.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpgroupsbpgroupscachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-cache.php 2018-11-02 14:17:03 UTC (rev 12272)
+++ trunk/src/bp-groups/bp-groups-cache.php 2018-11-05 20:20:05 UTC (rev 12273)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,6 +214,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'groups_member_after_save', 'groups_clear_group_administrator_cache_on_member_save' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 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 );
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Clear the group type cache for a group.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Called when group is deleted.
</span></span></pre></div>
<a id="trunksrcbpgroupsclassesclassbpgroupsmemberphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/classes/class-bp-groups-member.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/classes/class-bp-groups-member.php 2018-11-02 14:17:03 UTC (rev 12272)
+++ trunk/src/bp-groups/classes/class-bp-groups-member.php 2018-11-05 20:20:05 UTC (rev 12273)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1428,26 +1428,43 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Delete all group membership information for the specified user.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 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.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @since 1.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.0.0 The method behavior was changed so that single-member groups are not deleted.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $user_id ID of the user.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return mixed
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function delete_all_for_user( $user_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $group_ids = BP_Groups_Member::get_group_ids( $user_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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 );
</del><span class="cx" style="display: block; padding: 0 10px"> foreach ( $group_ids['groups'] as $group_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- groups_update_groupmeta( $group_id, 'total_member_count', groups_get_total_member_count( $group_id ) - 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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',
+ ] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // 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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d", $user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return true;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestcasesgroupsclassbpgroupsmemberphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/groups/class-bp-groups-member.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/groups/class-bp-groups-member.php 2018-11-02 14:17:03 UTC (rev 12272)
+++ trunk/tests/phpunit/testcases/groups/class-bp-groups-member.php 2018-11-05 20:20:05 UTC (rev 12273)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1454,4 +1454,46 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, $memberships );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( self::$group_ids[1], $memberships[0]->group_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @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' ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>