Ticket #8175: 8175.diff

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

@@ -893 +893 @@
         BP_XProfile_ProfileData::delete_data_for_user( $user_id );
 }
 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.
+ *
+ * On multisite, the 'delete_user' indicates only that the user is no longer a member of a
+ * site. In this case, the hook should not trigger data deletion.
+ *
+ * @since 6.0.0
+ *
+ * @param int $user_id The ID of the deleted user.
+ */
+function xprofile_remove_data_on_delete_user( $user_id ) {
+        if ( is_multisite() ) {
+                return;
+        }
+
+        xprofile_remove_data( $user_id );
+}
+add_action( 'delete_user', 'xprofile_remove_data_on_delete_user' );
+
 /*** XProfile Meta ****************************************************/
 
 /**

tests/phpunit/testcases/xprofile/functions.php

@@ -1131 +1131 @@
                 // Number of exported user properties.
                 $this->assertSame( 3, count( $actual['data'][0]['data'] ) );
         }
+
+        /**
+         * @group bbg
+         */
+        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 ) );
+        }
+
+        /**
+         * @group bbg
+         */
+        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 ) );
+        }
+
+        /**
+         * @group bbg
+         */
+        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 );
+                var_Dump( BP_PLUGIN_DIR );
+
+                $this->assertSame( 'foo', xprofile_get_field_data( $f1, $u ) );
+        }
 }