Changeset 5598 for trunk/bp-xprofile/bp-xprofile-classes.php

Timestamp:

12/24/2011 06:01:22 PM (14 years ago)

Author:

johnjamesjacoby

Message:

When deleting a field, do not delete the field data by default. Fixes #3888. In memory of jimgroom's lost data.

File:

• trunk/bp-xprofile/bp-xprofile-classes.php (modified) (2 diffs)

trunk/bp-xprofile/bp-xprofile-classes.php

@@ -374 +374 @@
     }
 
-    function delete() {
-        global $wpdb, $bp;
-
-        if ( !$this->id ||
-            /* Prevent deletion by url when can_delete is false. */
-            !$this->can_delete ||
-            /* Prevent deletion of option 1 since this invalidates fields with options. */
-            ( $this->parent_id && $this->option_order == 1 ) )
+    function delete( $delete_data = false ) {
+        global $wpdb, $bp;
+
+        // Prevent deletion if no ID is present
+        // Prevent deletion by url when can_delete is false.
+        // Prevent deletion of option 1 since this invalidates fields with options.
+        if ( !$this->id || !$this->can_delete || ( $this->parent_id && $this->option_order == 1 ) )
             return false;
 
@@ -387 +386 @@
             return false;
 
-        /* delete the data in the DB for this field */
-        BP_XProfile_ProfileData::delete_for_field( $this->id );
+        // delete the data in the DB for this field
+        if ( true === $delete_data )
+            BP_XProfile_ProfileData::delete_for_field( $this->id );
 
         return true;