Changeset 8653 for branches/2.0/bp-xprofile/bp-xprofile-classes.php

Timestamp:

07/20/2014 08:10:31 PM (11 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 (branch), props esroyo for initial patch

File:

• branches/2.0/bp-xprofile/bp-xprofile-classes.php (modified) (3 diffs)

branches/2.0/bp-xprofile/bp-xprofile-classes.php

@@ -1548 +1548 @@
      */
     public function edit_field_options_html( array $args = array() ) {
-        $options = $this->field_obj->get_children();
-        $date    = BP_XProfile_ProfileData::get_value_byid( $this->field_obj->id, $args['user_id'] );
+        $options    = $this->field_obj->get_children();
+        $date       = BP_XProfile_ProfileData::get_value_byid( $this->field_obj->id, $args['user_id'] );
+        $eng_months = array( 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December' );
 
         $day   = 0;
@@ -1580 +1581 @@
 
         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;
         }
@@ -1600 +1606 @@
 
             case 'month':
-                $eng_months = array( 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December' );
-
                 $months = array(
                     __( 'January', 'buddypress' ),