Changeset 8631

Timestamp:

07/16/2014 09:53:18 AM (12 years ago)

Author:

djpaul

Message:

xProfile: when updating a user profile, make sure the actions are passed the field's current (new) value.

Previously, we've been passing these actions the values that we've told xProfile to set, instead of the
field's actual (new) value. Most of the time, these will be identical, but with BP 2.0's xProfile field
type improvements, there are more lower-level places where the value could be filtered before the data's
written to the database.

In this situation, the field's actual new value could be different from what we've been returning in the
xprofile_profile_field_data_updated and xprofile_updated_profile actions.

See #5755

File:

• trunk/src/bp-xprofile/bp-xprofile-screens.php (modified) (1 diff)

trunk/src/bp-xprofile/bp-xprofile-screens.php

@@ -118 +118 @@
                                         'visibility' => xprofile_get_field_visibility_level( $field_id, bp_displayed_user_id() ),
                                 );
+
+                                // Update the field data and visibility level
+                                xprofile_set_field_visibility_level( $field_id, bp_displayed_user_id(), $visibility_level );
+                                $field_updated = xprofile_set_field_data( $field_id, bp_displayed_user_id(), $value, $is_required[ $field_id ] );
+                                $value         = xprofile_get_field_data( $field_id, bp_displayed_user_id() );
+
                                 $new_values[ $field_id ] = array(
                                         'value'      => $value,
-                                        'visibility' => $visibility_level,
+                                        'visibility' => xprofile_get_field_visibility_level( $field_id, bp_displayed_user_id() ),
                                 );
 
-                                if ( !xprofile_set_field_data( $field_id, bp_displayed_user_id(), $value, $is_required[$field_id] ) ) {
+                                if ( ! $field_updated ) {
                                         $errors = true;
                                 } else {
                                         do_action( 'xprofile_profile_field_data_updated', $field_id, $value );
                                 }
-
-                                // Save the visibility level
-                                xprofile_set_field_visibility_level( $field_id, bp_displayed_user_id(), $visibility_level );
                         }