Ticket #6658: 6658.01.patch

src/bp-xprofile/classes/class-bp-xprofile-field.php

@@ -360 +360 @@
                         return false;
                 }
 
+                // Delete all metadata for this field.
+                bp_xprofile_delete_meta( $this->id, 'field' );
+
                 // Delete the data in the DB for this field.
                 if ( true === $delete_data ) {
                         BP_XProfile_ProfileData::delete_for_field( $this->id );

tests/phpunit/testcases/xprofile/class-bp-xprofile-field.php

@@ -224 +224 @@
 
                 $this->set_current_user( $old_user );
         }
+
+        /**
+         * @ticket BP6658
+         */
+        public function test_delete_field_should_delete_default_field_metadata() {
+                $group = self::factory()->xprofile_group->create();
+                $field = self::factory()->xprofile_field->create( array(
+                        'field_group_id' => $group
+                ) );
+
+                $field_obj = new BP_XProfile_Field( $field );
+                $field_obj->delete();
+
+                $value = bp_xprofile_get_meta( $field, 'field', 'default_visibility' );
+                $this->assertEmpty( $value );
+        }
+
+        /**
+         * @ticket BP6658
+         */
+        public function test_delete_field_should_delete_custom_field_metadata() {
+                $group = self::factory()->xprofile_group->create();
+                $field = self::factory()->xprofile_field->create( array(
+                        'field_group_id' => $group
+                ) );
+
+                bp_xprofile_update_meta( $field, 'field', 'custom', 'metadata' );
+
+                $field_obj = new BP_XProfile_Field( $field );
+                $field_obj->delete();
+
+                $value = bp_xprofile_get_meta( $field, 'field', 'custom' );
+                $this->assertEmpty( $value );
+        }
 }