Changeset 3650 for trunk/bp-xprofile.php

Timestamp:

01/04/2011 12:33:48 PM (16 years ago)

Author:

boonebgorges

Message:

Ensures that datebox profile field types have their values displayed properly on the profile edit screen. Cleans us bp_get_the_profile_field_options() and reworks the way that default values work in the case of multiselect and checkbox fields. Fixes #2947. Props r-a-y, cnorris23

File:

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

trunk/bp-xprofile.php

@@ -226 +226 @@
                         if ( !isset( $_POST['field_' . $field_id] ) ) {
 
-                                if ( is_numeric( $_POST['field_' . $field_id . '_day'] ) ) {
+                                if ( !empty( $_POST['field_' . $field_id . '_day'] ) && is_numeric( $_POST['field_' . $field_id . '_day'] ) ) {
                                         /* Concatenate the values. */
                                         $date_value = $_POST['field_' . $field_id . '_day'] . ' ' .
@@ -251 +251 @@
                         /* Now we've checked for required fields, lets save the values. */
                         foreach ( (array)$posted_field_ids as $field_id ) {
-                                if ( !xprofile_set_field_data( $field_id, $bp->displayed_user->id, $_POST['field_' . $field_id], $is_required[$field_id] ) )
+                                
+                                // Certain types of fields (checkboxes, multiselects) may come through empty. Save them as an empty array so that they don't get overwritten by the default on the next edit.
+                                if ( empty( $_POST['field_' . $field_id] ) )
+                                        $value = array();
+                                else
+                                        $value = $_POST['field_' . $field_id];
+                                        
+                                if ( !xprofile_set_field_data( $field_id, $bp->displayed_user->id, $value, $is_required[$field_id] ) )
                                         $errors = true;
                                 else
-                                        do_action( 'xprofile_profile_field_data_updated', $field_id, $_POST['field_' . $field_id] );
+                                        do_action( 'xprofile_profile_field_data_updated', $field_id, $value );
                         }
 
@@ -668 +675 @@
                 return false;
 
-        /* If the value is empty, then delete any field data that exists */
-        if ( empty( $value ) ) {
+        $field = new BP_XProfile_Field( $field_id );
+
+        // If the value is empty, then delete any field data that exists, unless the field is of a
+        // type where null values are semantically meaningful
+        if ( empty( $value ) && 'checkbox' != $field->type && 'multiselectbox' != $field->type ) {
                 xprofile_delete_field_data( $field_id, $user_id );
                 return true;
         }
-
-        $field = new BP_XProfile_Field( $field_id );
 
         /* Check the value is an acceptable value */
@@ -688 +696 @@
                                         unset( $value[$i] );
                         }
-
-                        if ( empty( $value ) )
-                                return false;
 
                         /* Reset the keys by merging with an empty array */