Issue #323852, Validation was broken for unlimited value select widgets with required...

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index fb0c854..bb35752 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -5,6 +5,7 @@ Date Module 7.x
 Version 7.x-2.x-dev
 ===================
 
+- Issue #323852, Validation was broken for unlimited value select widgets with required dates, they were incorrectly getting their end dates cleared out.
 - Issue #1424656 by tim.plunkett, Unify signature and alters of #process callbacks.
 - Issue #1408014 by dasjo, We no longer need the $error_element value to display errors properly, second follow-up.
 - Issue #1299030 by Vincent B: Ensure that 'To Date' is properly marked when required.

diff --git a/date_elements.inc b/date_elements.inc
index 7abf956..6135823 100644 (file)
--- a/date_elements.inc
+++ b/date_elements.inc
@@ -291,7 +291,7 @@ function date_combo_element_process($element, &$form_state, $form) {
     unset($element['#default_value'][$to_field]);
   }
 
-  $show_todate = !empty($form_state['values']['show_todate']) || !empty($element['#default_value'][$to_field]);
+  $show_todate = !empty($form_state['values']['show_todate']) || !empty($element['#default_value'][$to_field]) || $instance['required'];
   $element['show_todate'] = array(
     '#title' => t('Show End Date'),
     '#type' => 'checkbox',