Changeset 12781

Timestamp:

11/11/2020 07:23:17 PM (4 years ago)

Author:

dcavins

Message:

Ensure cached data is cleared in BP_XProfile_ProfileData::delete_data_for_user().

Data was being deleted in bulk using a direct SQL
query, bypassing the xprofile_data_before_delete
and xprofile_data_after_delete actions, resulting in
stale data persisting in the xprofile cache. This
change uses xprofile_delete_field_data() to delete
the user's data so that the action hooks are called.

Props dd32, r-a-y, imath.

Fixes #8388.

Location:

trunk

Files:

• src/bp-xprofile/classes/class-bp-xprofile-profiledata.php (modified) (1 diff)
• tests/phpunit/testcases/xprofile/class-bp-xprofile-profiledata.php (modified) (1 diff)

trunk/src/bp-xprofile/classes/class-bp-xprofile-profiledata.php

@@ -682 +682 @@
         $bp = buddypress();
 
-        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_data} WHERE user_id = %d", $user_id ) );
+        $field_ids = $wpdb->get_col( $wpdb->prepare( "SELECT field_id FROM {$bp->profile->table_name_data} WHERE user_id = %d", $user_id ) );
+
+        if ( ! $field_ids ) {
+            return false;
+        }
+
+        foreach ( $field_ids as $field_id ) {
+            xprofile_delete_field_data( $field_id, $user_id );
+        }
+
+        return count( $field_ids );
     }
 

trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-profiledata.php

@@ -420 +420 @@
     }
 
+    /**
+     * @ticket BP8388
+     * @group xprofile_remove_data
+     */
+    public function test_cache_invalidated_when_xprofile_remove_data_called() {
+        $u = self::factory()->user->create();
+        $g = self::factory()->xprofile_group->create();
+        $f = self::factory()->xprofile_field->create( array(
+            'field_group_id' => $g,
+        ) );
+
+        xprofile_set_field_data( $f, $u, 'Foo' );
+        // Prime the cache.
+        xprofile_get_field_data( $f, $u );
+        xprofile_remove_data( $u );
+
+        $d = new BP_XProfile_ProfileData( $f, $u );
+        $this->assertFalse( $d->exists() );
+    }
+
     public function filter_time() {
         return $this->last_updated;