Changeset 12605 for trunk/src/bp-activity/bp-activity-functions.php

Timestamp:

03/29/2020 05:32:05 PM (6 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.

File:

• trunk/src/bp-activity/bp-activity-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' );
 
 /**