Changeset 8652

Timestamp:

07/20/2014 08:05:05 PM (12 years ago)

Author:

djpaul

Message:

xProfile: fix datebox field validation.

If a validation error occurred when saving a profile field(s), the
datebox field type wasn’t restoring the user-submitted value after the
screen was reloaded. This was a regression introduced in BuddyPress 2.0
with the Profile Field Types rewrite.

Fixes #5690 (trunk), props esroyo for initial patch

File:

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

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

@@ -1561 +1561 @@
         public function edit_field_options_html( array $args = array() ) {
 
-                $date  = BP_XProfile_ProfileData::get_value_byid( $this->field_obj->id, $args['user_id'] );
-                $day   = 0;
-                $month = 0;
-                $year  = 0;
-                $html  = '';
+                $date       = BP_XProfile_ProfileData::get_value_byid( $this->field_obj->id, $args['user_id'] );
+                $day        = 0;
+                $month      = 0;
+                $year       = 0;
+                $html       = '';
+                $eng_months = array( 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December' );
 
                 // Set day, month, year defaults
@@ -1592 +1593 @@
 
                 if ( ! empty( $_POST['field_' . $this->field_obj->id . '_month'] ) ) {
-                        $new_month = (int) $_POST['field_' . $this->field_obj->id . '_month'];
-                        $month     = ( $month != $new_month ) ? $new_month : $month;
+                        if ( in_array( $_POST['field_' . $this->field_obj->id . '_month'], $eng_months ) ) {
+                                $new_month = $_POST['field_' . $this->field_obj->id . '_month'];
+                        } else {
+                                $new_month = $month;
+                        }
+
+                        $month = ( $month !== $new_month ) ? $new_month : $month;
                 }
 
                 if ( ! empty( $_POST['field_' . $this->field_obj->id . '_year'] ) ) {
-                        $new_year = date( 'j', (int) $_POST['field_' . $this->field_obj->id . '_year'] );
+                        $new_year = (int) $_POST['field_' . $this->field_obj->id . '_year'];
                         $year     = ( $year != $new_year ) ? $new_year : $year;
                 }
@@ -1612 +1618 @@
 
                         case 'month':
-                                $eng_months = array( 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December' );
-
                                 $months = array(
                                         __( 'January',   'buddypress' ),