Changeset 12605

Timestamp:

03/29/2020 05:32:05 PM (4 years ago)

Author:

boonebgorges

Message:

Don't delete user data on delete_user hook on Multisite.

The new function bp_remove_user_data_on_delete_user_hook(), which defaults
to false on Multisite and true otherwise, helps BuddyPress to differentiate
between the use of wp_delete_user() to delete a user account from an
installation (typical on non-Multisite) and its use to remove a user from
a site in a Multisite instance.

Props imath.

Fixes #8175.

Location:

trunk

Files:

• src/bp-activity/bp-activity-functions.php (modified) (1 diff)
• src/bp-blogs/bp-blogs-functions.php (modified) (1 diff)
• src/bp-friends/bp-friends-functions.php (modified) (1 diff)
• src/bp-groups/bp-groups-functions.php (modified) (1 diff)
• src/bp-members/bp-members-functions.php (modified) (4 diffs)
• src/bp-notifications/bp-notifications-functions.php (modified) (1 diff)
• src/bp-xprofile/bp-xprofile-functions.php (modified) (1 diff)
• tests/phpunit/testcases/activity/functions.php (modified) (1 diff)
• tests/phpunit/testcases/blogs/functions.php (modified) (1 diff)
• tests/phpunit/testcases/friends/activity.php (modified) (1 diff)
• tests/phpunit/testcases/friends/functions.php (modified) (1 diff)
• tests/phpunit/testcases/groups/functions.php (modified) (1 diff)
• tests/phpunit/testcases/members/functions.php (modified) (1 diff)
• tests/phpunit/testcases/notifications/functions.php (modified) (2 diffs)
• tests/phpunit/testcases/xprofile/functions.php (modified) (1 diff)

trunk/src/bp-activity/bp-activity-functions.php

@@ -1278 +1278 @@
 }
 add_action( 'wpmu_delete_user',  'bp_activity_remove_all_user_data' );
-add_action( 'delete_user',       'bp_activity_remove_all_user_data' );
+
+/**
+ * Deletes user activity data on the 'delete_user' hook.
+ *
+ * @since 6.0.0
+ *
+ * @param int $user_id The ID of the deleted user.
+ */
+function bp_activity_remove_all_user_data_on_delete_user( $user_id ) {
+    if ( ! bp_remove_user_data_on_delete_user_hook( 'activity', $user_id ) ) {
+        return;
+    }
+
+    bp_activity_remove_all_user_data( $user_id );
+}
+add_action( 'delete_user', 'bp_activity_remove_all_user_data_on_delete_user' );
 
 /**

trunk/src/bp-blogs/bp-blogs-functions.php

@@ -1434 +1434 @@
 }
 add_action( 'wpmu_delete_user',  'bp_blogs_remove_data' );
-add_action( 'delete_user',       'bp_blogs_remove_data' );
 add_action( 'bp_make_spam_user', 'bp_blogs_remove_data' );
+
+/**
+ * Deletes user XProfile data on the 'delete_user' hook.
+ *
+ * @since 6.0.0
+ *
+ * @param int $user_id The ID of the deleted user.
+ */
+function bp_blogs_remove_data_on_delete_user( $user_id ) {
+    if ( ! bp_remove_user_data_on_delete_user_hook( 'blogs', $user_id ) ) {
+        return;
+    }
+
+    bp_blogs_remove_data( $user_id );
+}
+add_action( 'delete_user', 'bp_blogs_remove_data_on_delete_user' );
 
 /**

trunk/src/bp-friends/bp-friends-functions.php

@@ -758 +758 @@
 }
 add_action( 'wpmu_delete_user',  'friends_remove_data' );
-add_action( 'delete_user',       'friends_remove_data' );
 add_action( 'bp_make_spam_user', 'friends_remove_data' );
+
+/**
+ * Deletes user Friends data on the 'delete_user' hook.
+ *
+ * @since 6.0.0
+ *
+ * @param int $user_id The ID of the deleted user.
+ */
+function bp_friends_remove_data_on_delete_user( $user_id ) {
+    if ( ! bp_remove_user_data_on_delete_user_hook( 'friends', $user_id ) ) {
+        return;
+    }
+
+    friends_remove_data( $user_id );
+}
+add_action( 'delete_user', 'bp_friends_remove_data_on_delete_user' );
 
 /**

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

@@ -2418 +2418 @@
 }
 add_action( 'wpmu_delete_user',  'groups_remove_data_for_user' );
-add_action( 'delete_user',       'groups_remove_data_for_user' );
 add_action( 'bp_make_spam_user', 'groups_remove_data_for_user' );
+
+/**
+ * Deletes user group data on the 'delete_user' hook.
+ *
+ * @since 6.0.0
+ *
+ * @param int $user_id The ID of the deleted user.
+ */
+function bp_groups_remove_data_for_user_on_delete_user( $user_id ) {
+    if ( ! bp_remove_user_data_on_delete_user_hook( 'groups', $user_id ) ) {
+        return;
+    }
+
+    groups_remove_data_for_user( $user_id );
+}
+add_action( 'delete_user', 'bp_groups_remove_data_for_user_on_delete_user' );
 
 /**

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

@@ -1263 +1263 @@
 
 /**
+ * Determines whether user data should be removed on the 'delete_user' hook.
+ *
+ * WordPress's 'delete_user' hook is ambiguous: on a standard installation, it means that a user
+ * account is being removed from the system, while on Multisite it simply means the user is
+ * being removed from a specific site (ie its roles are being revoked). As a rule, this means
+ * that BuddyPress should remove user data on the delete_user hook only on non-Multisite
+ * installations - only when the user account is being removed altogether. However, this behavior
+ * can be filtered in a global, per-user, or per-component fashion.
+ *
+ * @since 6.0.0
+ *
+ * @param string $data_type Type of data to be removed.
+ * @param int    $user_id   ID of the user, as passed to 'delete_user'.
+ * @return bool
+ */
+function bp_remove_user_data_on_delete_user_hook( $component, $user_id ) {
+    $remove = ! is_multisite();
+
+    /**
+     * Filters whether to remove user data on the 'delete_user' hook.
+     *
+     * @param bool   $remove    Whether data should be removed.
+     * @param string $data_type Type of data to be removed.
+     * @param int    $user_id   ID of the user, as passed to 'delete_user'.
+     */
+    return apply_filters( 'bp_remove_user_data_on_delete_user_hook', $remove, $component, $user_id );
+}
+
+/**
  * Delete a user's avatar when the user is deleted.
  *
@@ -1277 +1306 @@
 }
 add_action( 'wpmu_delete_user', 'bp_core_delete_avatar_on_user_delete' );
-add_action( 'delete_user', 'bp_core_delete_avatar_on_user_delete' );
+
+/**
+ * Deletes last_activity data on the 'delete_user' hook.
+ *
+ * @since 6.0.0
+ *
+ * @param int $user_id The ID of the deleted user.
+ */
+function bp_core_delete_avatar_on_delete_user( $user_id ) {
+    if ( ! bp_remove_user_data_on_delete_user_hook( 'avatar', $user_id ) ) {
+        return;
+    }
+
+    bp_core_delete_avatar_on_user_delete( $user_id );
+}
+add_action( 'delete_user', 'bp_core_delete_avatar_on_delete_user' );
 
 /**
@@ -1345 +1389 @@
 }
 add_action( 'wpmu_delete_user',  'bp_core_remove_data' );
-add_action( 'delete_user',       'bp_core_remove_data' );
 add_action( 'bp_make_spam_user', 'bp_core_remove_data' );
+
+/**
+ * Deletes last_activity data on the 'delete_user' hook.
+ *
+ * @since 6.0.0
+ *
+ * @param int $user_id The ID of the deleted user.
+ */
+function bp_core_remove_data_on_delete_user( $user_id ) {
+    if ( ! bp_remove_user_data_on_delete_user_hook( 'last_activity', $user_id ) ) {
+        return;
+    }
+
+    bp_core_remove_data( $user_id );
+}
+add_action( 'delete_user', 'bp_core_remove_data_on_delete_user' );
 
 /**
@@ -2838 +2897 @@
 }
 add_action( 'wpmu_delete_user', 'bp_remove_member_type_on_user_delete' );
-add_action( 'delete_user', 'bp_remove_member_type_on_user_delete' );
+
+/**
+ * Deletes user member type on the 'delete_user' hook.
+ *
+ * @since 6.0.0
+ *
+ * @param int $user_id The ID of the deleted user.
+ */
+function bp_remove_member_type_on_delete_user( $user_id ) {
+    if ( ! bp_remove_user_data_on_delete_user_hook( 'member_type', $user_id ) ) {
+        return;
+    }
+
+    bp_remove_member_type_on_user_delete( $user_id );
+}
+add_action( 'delete_user', 'bp_remove_member_type_on_delete_user' );
 
 /**

trunk/src/bp-notifications/bp-notifications-functions.php

@@ -446 +446 @@
 }
 add_action( 'wpmu_delete_user', 'bp_notifications_delete_notifications_on_user_delete' );
-add_action( 'delete_user', 'bp_notifications_delete_notifications_on_user_delete' );
+
+/**
+ * Deletes user notifications data on the 'delete_user' hook.
+ *
+ * @since 6.0.0
+ *
+ * @param int $user_id The ID of the deleted user.
+ */
+function bp_notifications_delete_notifications_on_delete_user( $user_id ) {
+    if ( ! bp_remove_user_data_on_delete_user_hook( 'notifications', $user_id ) ) {
+        return;
+    }
+
+    bp_notifications_delete_notifications_on_user_delete( $user_id );
+}
+
+add_action( 'delete_user', 'bp_notifications_delete_notifications_on_delete_user' );
 
 /** Mark **********************************************************************/

trunk/src/bp-xprofile/bp-xprofile-functions.php

@@ -848 +848 @@
 }
 add_action( 'wpmu_delete_user',  'xprofile_remove_data' );
-add_action( 'delete_user',       'xprofile_remove_data' );
 add_action( 'bp_make_spam_user', 'xprofile_remove_data' );
+
+/**
+ * Deletes user XProfile data on the 'delete_user' hook.
+ *
+ * @since 6.0.0
+ *
+ * @param int $user_id The ID of the deleted user.
+ */
+function xprofile_remove_data_on_delete_user( $user_id ) {
+    if ( ! bp_remove_user_data_on_delete_user_hook( 'xprofile', $user_id ) ) {
+        return;
+    }
+
+    xprofile_remove_data( $user_id );
+}
+add_action( 'delete_user', 'xprofile_remove_data_on_delete_user' );
 
 /*** XProfile Meta ****************************************************/

trunk/tests/phpunit/testcases/activity/functions.php

@@ -1804 +1804 @@
         $this->assertSame( 3, count( $actual['data'] ) );
     }
+
+    /**
+     * @ticket BP8175
+     */
+    public function test_activity_data_should_be_deleted_on_user_delete_non_multisite() {
+        if ( is_multisite() ) {
+            $this->markTestSkipped( __METHOD__ . ' requires non-multisite.' );
+        }
+
+        $u1 = self::factory()->user->create();
+        $a1 = self::factory()->activity->create(
+            array(
+                'user_id'   => $u1,
+                'component' => 'activity',
+                'type'      => 'activity_update',
+            )
+        );
+
+        $latest_update = array(
+            'id'      => $a1,
+            'content' => 'Foo',
+        );
+        bp_update_user_meta( $u1, 'bp_latest_update', $latest_update );
+
+        bp_activity_add_user_favorite( $a1, $u1 );
+
+        $found = bp_activity_get(
+            array(
+                'filter' => array(
+                    'user_id' => $u1,
+                )
+            )
+        );
+
+        $this->assertEqualSets( [ $a1 ], wp_list_pluck( $found['activities'], 'id' ) );
+        $this->assertEqualSets( [ $a1 ], bp_activity_get_user_favorites( $u1 ) );
+        $this->assertSame( $latest_update, bp_get_user_meta( $u1, 'bp_latest_update', true ) );
+
+        wp_delete_user( $u1 );
+
+        $found = bp_activity_get(
+            array(
+                'filter' => array(
+                    'user_id' => $u1,
+                )
+            )
+        );
+
+        $this->assertEmpty( $found['activities'] );
+        $this->assertEmpty( bp_activity_get_user_favorites( $u1 ) );
+        $this->assertSame( '', bp_get_user_meta( $u1, 'bp_latest_update', true ) );
+    }
+
+    /**
+     * @ticket BP8175
+     */
+    public function test_activity_data_should_be_deleted_on_user_delete_multisite() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
+        }
+
+        $u1 = self::factory()->user->create();
+        $a1 = self::factory()->activity->create(
+            array(
+                'user_id'   => $u1,
+                'component' => 'activity',
+                'type'      => 'activity_update',
+            )
+        );
+
+        $latest_update = array(
+            'id'      => $a1,
+            'content' => 'Foo',
+        );
+        bp_update_user_meta( $u1, 'bp_latest_update', $latest_update );
+
+        bp_activity_add_user_favorite( $a1, $u1 );
+
+        $found = bp_activity_get(
+            array(
+                'filter' => array(
+                    'user_id' => $u1,
+                )
+            )
+        );
+
+        $this->assertEqualSets( [ $a1 ], wp_list_pluck( $found['activities'], 'id' ) );
+        $this->assertEqualSets( [ $a1 ], bp_activity_get_user_favorites( $u1 ) );
+        $this->assertSame( $latest_update, bp_get_user_meta( $u1, 'bp_latest_update', true ) );
+
+        wpmu_delete_user( $u1 );
+
+        $found = bp_activity_get(
+            array(
+                'filter' => array(
+                    'user_id' => $u1,
+                )
+            )
+        );
+
+        $this->assertEmpty( $found['activities'] );
+        $this->assertEmpty( bp_activity_get_user_favorites( $u1 ) );
+        $this->assertSame( '', bp_get_user_meta( $u1, 'bp_latest_update', true ) );
+    }
+
+    /**
+     * @ticket BP8175
+     */
+    public function test_activity_data_should_not_be_deleted_on_wp_delete_user_multisite() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
+        }
+
+        $u1 = self::factory()->user->create();
+        $a1 = self::factory()->activity->create(
+            array(
+                'user_id'   => $u1,
+                'component' => 'activity',
+                'type'      => 'activity_update',
+            )
+        );
+
+        $latest_update = array(
+            'id'      => $a1,
+            'content' => 'Foo',
+        );
+        bp_update_user_meta( $u1, 'bp_latest_update', $latest_update );
+
+        bp_activity_add_user_favorite( $a1, $u1 );
+
+        $found = bp_activity_get(
+            array(
+                'filter' => array(
+                    'user_id' => $u1,
+                )
+            )
+        );
+
+        $this->assertEqualSets( [ $a1 ], wp_list_pluck( $found['activities'], 'id' ) );
+        $this->assertEqualSets( [ $a1 ], bp_activity_get_user_favorites( $u1 ) );
+        $this->assertSame( $latest_update, bp_get_user_meta( $u1, 'bp_latest_update', true ) );
+
+        wp_delete_user( $u1 );
+
+        $found = bp_activity_get(
+            array(
+                'filter' => array(
+                    'user_id' => $u1,
+                )
+            )
+        );
+
+        $this->assertEqualSets( [ $a1 ], wp_list_pluck( $found['activities'], 'id' ) );
+        $this->assertEqualSets( [ $a1 ], bp_activity_get_user_favorites( $u1 ) );
+        $this->assertSame( $latest_update, bp_get_user_meta( $u1, 'bp_latest_update', true ) );
+    }
 }

trunk/tests/phpunit/testcases/blogs/functions.php

@@ -1142 +1142 @@
         return ! empty( $a['activities'] );
     }
+
+    /**
+     * @ticket BP8175
+     */
+    public function test_blogs_data_should_be_deleted_on_user_delete_multisite() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
+        }
+
+        if ( function_exists( 'wp_initialize_site' ) ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
+        }
+
+        $u1 = self::factory()->user->create();
+        $b1 = get_current_blog_id();
+        $b2 = self::factory()->blog->create();
+
+        bp_blogs_record_blog( $b1, $u1, true );
+        bp_blogs_record_blog( $b2, $u1, true );
+
+        $blogs = bp_blogs_get_blogs_for_user( $u1 );
+
+        $this->assertEqualSets( [ $b1, $b2 ], wp_list_pluck( $blogs['blogs'], 'blog_id' ) );
+
+        wpmu_delete_user( $u1 );
+
+        $blogs = bp_blogs_get_blogs_for_user( $u1 );
+
+        $this->assertEmpty( $blogs['blogs'] );
+    }
+
+    /**
+     * @ticket BP8175
+     */
+    public function test_blogs_data_should_not_be_deleted_on_wp_delete_user_multisite() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
+        }
+
+        if ( function_exists( 'wp_initialize_site' ) ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
+        }
+
+        $u1 = self::factory()->user->create();
+        $b1 = get_current_blog_id();
+        $b2 = self::factory()->blog->create();
+
+        bp_blogs_record_blog( $b1, $u1, true );
+        bp_blogs_record_blog( $b2, $u1, true );
+
+        $blogs = bp_blogs_get_blogs_for_user( $u1 );
+
+        $this->assertEqualSets( [ $b1, $b2 ], wp_list_pluck( $blogs['blogs'], 'blog_id' ) );
+
+        wp_delete_user( $u1 );
+
+        $blogs = bp_blogs_get_blogs_for_user( $u1 );
+
+        $this->assertEqualSets( [ $b2 ], wp_list_pluck( $blogs['blogs'], 'blog_id' ) );
+    }
 }

trunk/tests/phpunit/testcases/friends/activity.php

@@ -206 +206 @@
 
         // Delete $u1.
-        wp_delete_user( $u1 );
+        $this->delete_user( $u1 );
 
         // 'friendship_created' activity item should not exist.

trunk/tests/phpunit/testcases/friends/functions.php

@@ -484 +484 @@
         $this->assertEqualSets( $expected_ids, wp_list_pluck( $actual['data'], 'item_id' ) );
     }
+
+    /**
+     * @ticket BP8175
+     */
+    public function test_friends_data_should_be_deleted_on_user_delete_non_multisite() {
+        if ( is_multisite() ) {
+            $this->markTestSkipped( __METHOD__ . ' requires non-multisite.' );
+        }
+
+        $u1 = self::factory()->user->create();
+        $u2 = self::factory()->user->create();
+
+        friends_add_friend( $u1, $u2, true );
+
+        $this->assertEquals( 'is_friend', BP_Friends_Friendship::check_is_friend( $u1, $u2 ) );
+
+        wp_delete_user( $u1 );
+
+        $this->assertEquals( 'not_friends', BP_Friends_Friendship::check_is_friend( $u1, $u2 ) );
+    }
+
+    /**
+     * @ticket BP8175
+     */
+    public function test_xprofile_data_should_be_deleted_on_user_delete_multisite() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
+        }
+
+        $u1 = self::factory()->user->create();
+        $u2 = self::factory()->user->create();
+
+        friends_add_friend( $u1, $u2, true );
+
+        $this->assertEquals( 'is_friend', BP_Friends_Friendship::check_is_friend( $u1, $u2 ) );
+
+        wpmu_delete_user( $u1 );
+
+        $this->assertEquals( 'not_friends', BP_Friends_Friendship::check_is_friend( $u1, $u2 ) );
+    }
+
+    /**
+     * @ticket BP8175
+     */
+    public function test_xprofile_data_should_not_be_deleted_on_wp_delete_user_multisite() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
+        }
+
+        $u1 = self::factory()->user->create();
+        $u2 = self::factory()->user->create();
+
+        friends_add_friend( $u1, $u2, true );
+
+        $this->assertEquals( 'is_friend', BP_Friends_Friendship::check_is_friend( $u1, $u2 ) );
+
+        wp_delete_user( $u1 );
+
+        $this->assertEquals( 'is_friend', BP_Friends_Friendship::check_is_friend( $u1, $u2 ) );
+    }
 }

trunk/tests/phpunit/testcases/groups/functions.php

@@ -950 +950 @@
         $this->assertSame( 'bp-group-pending-received-invitation-' . self::$group_ids[0], $actual['data'][0]['item_id'] );
     }
+
+    /**
+     * @ticket BP8175
+     */
+    public function test_groups_data_should_be_deleted_on_user_delete_non_multisite() {
+        if ( is_multisite() ) {
+            $this->markTestSkipped( __METHOD__ . ' requires non-multisite.' );
+        }
+
+        $u = self::factory()->user->create();
+
+        groups_join_group( self::$group_ids[0], $u );
+
+        $this->assertNotEmpty( groups_is_user_member( $u, self::$group_ids[0] ) );
+
+        wp_delete_user( $u );
+
+        $this->assertFalse( groups_is_user_member( $u, self::$group_ids[0] ) );
+    }
+
+    /**
+     * @ticket BP8175
+     */
+    public function test_groups_data_should_be_deleted_on_user_delete_multisite() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
+        }
+
+        $u = self::factory()->user->create();
+
+        groups_join_group( self::$group_ids[0], $u );
+
+        $this->assertNotEmpty( groups_is_user_member( $u, self::$group_ids[0] ) );
+
+        wpmu_delete_user( $u );
+
+        $this->assertFalse( groups_is_user_member( $u, self::$group_ids[0] ) );
+    }
+
+    /**
+     * @ticket BP8175
+     */
+    public function test_groups_data_should_not_be_deleted_on_wp_delete_user_multisite() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
+        }
+
+        $u = self::factory()->user->create();
+
+        groups_join_group( self::$group_ids[0], $u );
+
+        $this->assertNotEmpty( groups_is_user_member( $u, self::$group_ids[0] ) );
+
+        wp_delete_user( $u );
+
+        $this->assertNotEmpty( groups_is_user_member( $u, self::$group_ids[0] ) );
+    }
 }

trunk/tests/phpunit/testcases/members/functions.php

@@ -47 +47 @@
         $this->set_current_user( $current_user );
         bp_update_option( 'bp-disable-account-deletion', $deletion_disabled );
+    }
+
+    /**
+     * @ticket BP8175
+     */
+    public function test_last_activity_data_should_be_deleted_on_user_delete_non_multisite() {
+        if ( is_multisite() ) {
+            $this->markTestSkipped( __METHOD__ . ' requires non-multisite.' );
+        }
+
+        $u1 = self::factory()->user->create();
+
+        $now = time();
+        bp_update_user_last_activity( $u1, $now );
+
+        $this->assertEquals( $now, bp_get_user_last_activity( $u1 ) );
+
+        wp_delete_user( $u1 );
+
+        $this->assertEquals( '', bp_get_user_last_activity( $u1 ) );
+    }
+
+    /**
+     * @ticket BP8175
+     */
+    public function test_last_activity_data_should_be_deleted_on_user_delete_multisite() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
+        }
+
+        $u1 = self::factory()->user->create();
+
+        $now = time();
+        bp_update_user_last_activity( $u1, $now );
+
+        $this->assertEquals( $now, bp_get_user_last_activity( $u1 ) );
+
+        wpmu_delete_user( $u1 );
+
+        $this->assertEquals( '', bp_get_user_last_activity( $u1 ) );
+    }
+
+    /**
+     * @ticket BP8175
+     */
+    public function test_last_activity_data_should_not_be_deleted_on_wp_delete_user_multisite() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
+        }
+
+        $u1 = self::factory()->user->create();
+
+        $now = time();
+        bp_update_user_last_activity( $u1, $now );
+
+        $this->assertEquals( $now, bp_get_user_last_activity( $u1 ) );
+
+        wp_delete_user( $u1 );
+
+        $this->assertEquals( $now, bp_get_user_last_activity( $u1 ) );
     }
 

trunk/tests/phpunit/testcases/notifications/functions.php

@@ -347 +347 @@
         $this->assertEqualSets( array( $n1, $n2, $n3, $n4, $n5 ), $found1 );
 
-        wp_delete_user( $u );
+        $this->delete_user( $u );
 
         // Check if notifications are deleted.
@@ -464 +464 @@
         $this->assertSame( 2, count( $actual['data'] ) );
     }
+
+    /**
+     * @ticket BP8175
+     */
+    public function test_notifications_data_should_be_deleted_on_user_delete_non_multisite() {
+        if ( is_multisite() ) {
+            $this->markTestSkipped( __METHOD__ . ' requires non-multisite.' );
+        }
+
+        $u = self::factory()->user->create();
+
+        $n1 = self::factory()->notification->create( array(
+            'component_name'    => 'messages',
+            'component_action'  => 'new_message',
+            'item_id'           => 99,
+            'user_id'           => $u,
+        ) );
+
+        $found = bp_notifications_get_notifications_for_user( $u, 'object' );
+        $this->assertEqualSets( [ $n1 ], wp_list_pluck( $found, 'id' ) );
+
+        wp_delete_user( $u );
+
+        $found = bp_notifications_get_notifications_for_user( $u, 'object' );
+        $this->assertEmpty( '', $found );
+    }
+
+    /**
+     * @ticket BP8175
+     */
+    public function test_notifications_data_should_be_deleted_on_user_delete_multisite() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
+        }
+
+        $u = self::factory()->user->create();
+
+        $n1 = self::factory()->notification->create( array(
+            'component_name'    => 'messages',
+            'component_action'  => 'new_message',
+            'item_id'           => 99,
+            'user_id'           => $u,
+        ) );
+
+        $found = bp_notifications_get_notifications_for_user( $u, 'object' );
+        $this->assertEqualSets( [ $n1 ], wp_list_pluck( $found, 'id' ) );
+
+        wpmu_delete_user( $u );
+
+        $found = bp_notifications_get_notifications_for_user( $u, 'object' );
+        $this->assertEmpty( '', $found );
+    }
+
+    /**
+     * @ticket BP8175
+     */
+    public function test_notifications_data_should_not_be_deleted_on_wp_delete_user_multisite() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
+        }
+
+        $u = self::factory()->user->create();
+
+        $n1 = self::factory()->notification->create( array(
+            'component_name'    => 'messages',
+            'component_action'  => 'new_message',
+            'item_id'           => 99,
+            'user_id'           => $u,
+        ) );
+
+        $found = bp_notifications_get_notifications_for_user( $u, 'object' );
+        $this->assertEqualSets( [ $n1 ], wp_list_pluck( $found, 'id' ) );
+
+        wp_delete_user( $u );
+
+        $found = bp_notifications_get_notifications_for_user( $u, 'object' );
+        $this->assertEqualSets( [ $n1 ], wp_list_pluck( $found, 'id' ) );
+    }
 }

trunk/tests/phpunit/testcases/xprofile/functions.php

@@ -1132 +1132 @@
         $this->assertSame( 3, count( $actual['data'][0]['data'] ) );
     }
+
+    /**
+     * @ticket BP8175
+     */
+    public function test_xprofile_data_should_be_deleted_on_user_delete_non_multisite() {
+        if ( is_multisite() ) {
+            $this->markTestSkipped( __METHOD__ . ' requires non-multisite.' );
+        }
+
+        $u = self::factory()->user->create();
+
+        $fg = self::factory()->xprofile_group->create();
+        $f1 = self::factory()->xprofile_field->create(
+            array(
+                'field_group_id' => $fg,
+            )
+        );
+
+        xprofile_set_field_data( $f1, $u, 'foo' );
+        $this->assertSame( 'foo', xprofile_get_field_data( $f1, $u ) );
+
+        wp_delete_user( $u );
+
+        $this->assertSame( '', xprofile_get_field_data( $f1, $u ) );
+    }
+
+    /**
+     * @ticket BP8175
+     */
+    public function test_xprofile_data_should_be_deleted_on_user_delete_multisite() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
+        }
+
+        $u = self::factory()->user->create();
+
+        $fg = self::factory()->xprofile_group->create();
+        $f1 = self::factory()->xprofile_field->create(
+            array(
+                'field_group_id' => $fg,
+            )
+        );
+
+        xprofile_set_field_data( $f1, $u, 'foo' );
+        $this->assertSame( 'foo', xprofile_get_field_data( $f1, $u ) );
+
+        wpmu_delete_user( $u );
+
+        $this->assertSame( '', xprofile_get_field_data( $f1, $u ) );
+    }
+
+    /**
+     * @ticket BP8175
+     */
+    public function test_xprofile_data_should_not_be_deleted_on_wp_delete_user_multisite() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
+        }
+
+        $u = self::factory()->user->create();
+
+        $fg = self::factory()->xprofile_group->create();
+        $f1 = self::factory()->xprofile_field->create(
+            array(
+                'field_group_id' => $fg,
+            )
+        );
+
+        xprofile_set_field_data( $f1, $u, 'foo' );
+        $this->assertSame( 'foo', xprofile_get_field_data( $f1, $u ) );
+
+        wp_delete_user( $u );
+
+        $this->assertSame( 'foo', xprofile_get_field_data( $f1, $u ) );
+    }
 }