Changeset 11295 for trunk/src/bp-members/bp-members-screens.php

Timestamp:

12/13/2016 03:09:52 AM (5 years ago)

Author:

boonebgorges

Message:

XProfile: Abstract date-parsing logic during save routines into standalone function.

This ensures that validation works the same way in all contexts where
date fields can be saved.

Props lakrisgubben.
Fixes #4187.

File:

• trunk/src/bp-members/bp-members-screens.php (modified) (2 diffs)

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

@@ -150 +150 @@
                 // Loop through the posted fields formatting any datebox values then validate the field.
                 foreach ( (array) $profile_field_ids as $field_id ) {
-                    if ( !isset( $_POST['field_' . $field_id] ) ) {
-                        if ( !empty( $_POST['field_' . $field_id . '_day'] ) && !empty( $_POST['field_' . $field_id . '_month'] ) && !empty( $_POST['field_' . $field_id . '_year'] ) )
-                            $_POST['field_' . $field_id] = date( 'Y-m-d H:i:s', strtotime( $_POST['field_' . $field_id . '_day'] . $_POST['field_' . $field_id . '_month'] . $_POST['field_' . $field_id . '_year'] ) );
-                    }
+                    bp_xprofile_maybe_format_datebox_post_data( $field_id );
 
                     // Create errors for required fields without values.
@@ -219 +216 @@
                     $profile_field_ids = explode( ',', $_POST['signup_profile_field_ids'] );
 
-                    // Loop through the posted fields formatting any datebox values then add to usermeta - @todo This logic should be shared with the same in xprofile_screen_edit_profile().
+                    /*
+                     * Loop through the posted fields, formatting any
+                     * datebox values, then add to usermeta.
+                     */
                     foreach ( (array) $profile_field_ids as $field_id ) {
-                        if ( ! isset( $_POST['field_' . $field_id] ) ) {
-
-                            if ( ! empty( $_POST['field_' . $field_id . '_day'] ) && ! empty( $_POST['field_' . $field_id . '_month'] ) && ! empty( $_POST['field_' . $field_id . '_year'] ) ) {
-                                // Concatenate the values.
-                                $date_value = $_POST['field_' . $field_id . '_day'] . ' ' . $_POST['field_' . $field_id . '_month'] . ' ' . $_POST['field_' . $field_id . '_year'];
-
-                                // Turn the concatenated value into a timestamp.
-                                $_POST['field_' . $field_id] = date( 'Y-m-d H:i:s', strtotime( $date_value ) );
-                            }
-                        }
+                        bp_xprofile_maybe_format_datebox_post_data( $field_id );
 
                         if ( !empty( $_POST['field_' . $field_id] ) )