Changeset 2842 for trunk/bp-xprofile.php

Timestamp:

03/12/2010 01:03:42 PM (15 years ago)

Author:

apeatling

Message:

Merging 1.2 branch with trunk

File:

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

trunk/bp-xprofile.php

@@ -324 +324 @@
         }
 
-        if ( $errors )
+        if ( !empty( $errors ) )
             bp_core_add_message( __( 'Please make sure you fill in all required fields in this profile field group before saving.', 'buddypress' ), 'error' );
         else {
@@ -338 +338 @@
             }
 
-            do_action( 'xprofile_updated_profile', $posted_field_ids, $errors );
+            do_action( 'xprofile_updated_profile', $bp->displayed_user->id, $posted_field_ids, $errors );
 
             /* Set the feedback messages */
@@ -731 +731 @@
         return false;
 
+    /* If the value is empty, then delete any field data that exists */
+    if ( empty( $value ) ) {
+        xprofile_delete_field_data( $field_id, $user_id );
+        return true;
+    }
+
     $field = new BP_XProfile_Field( $field_id );
 
@@ -776 +782 @@
         $field_id = xprofile_get_field_id_from_name( $field );
 
-    if ( !$field_id )
-        return false;
-
-    $field = new BP_XProfile_ProfileData( $field_id );
+    if ( empty( $field_id ) || empty( $user_id ) )
+        return false;
+
+    $field = new BP_XProfile_ProfileData( $field_id, $user_id );
     return $field->delete();
 }