CRM-14576 - Fix issue with select display after a form error occurs.

diff --git a/CRM/UF/Form/Field.php b/CRM/UF/Form/Field.php
index 12718a13def0a5863ce42823533f551c8c6f1247..bbb39deec50e6746633887f55099d49ba579b38e 100644 (file)
--- a/CRM/UF/Form/Field.php
+++ b/CRM/UF/Form/Field.php
@@ -384,21 +384,19 @@ class CRM_UF_Form_Field extends CRM_Core_Form {
 
     if (empty($formValues)) {
       for ($k = 1; $k < 4; $k++) {
-        if (!$defaults['field_name'][$k]) {
+        if (!isset($defaults['field_name'][$k])) {
           $js .= "{$formName}['field_name[$k]'].style.display = 'none';\n";
         }
       }
     }
     else {
       if (!empty($formValues['field_name'])) {
-        foreach ($formValues['field_name'] as $value) {
-          for ($k = 1; $k < 4; $k++) {
-            if (!isset($formValues['field_name'][$k]) || !$formValues['field_name'][$k]) {
-              $js .= "{$formName}['field_name[$k]'].style.display = 'none';\n";
-            }
-            else {
-              $js .= "{$formName}['field_name[$k]'].style.display = '';\n";
-            }
+        for ($key = 1; $key < 4; $key++) {
+          if (!isset($formValues['field_name'][$key])) {
+            $js .= "{$formName}['field_name[$key]'].style.display = 'none';\n";
+          }
+          else {
+            $js .= "{$formName}['field_name[$key]'].style.display = '';\n";
           }
         }
       }