Merge pull request #18080 from seamuslee001/dev_core_1928

dev/core#1928 Fix HTML5 error due to required attribute being set swi…
civicrm · Aug 6, 2020 · 5a4651d · 5a4651d
2 parents 3fb7c1e + 996b358
commit 5a4651d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
@@ -1205,10 +1205,12 @@ public function &addRadio($name, $title, $values, $attributes = [], $separator =
           }
         }
       }
-      $element = $this->createElement('radio', NULL, NULL, $var, $key, $optAttributes);
+      // We use a class here to avoid html5 issues with collapsed cutsomfield sets.
+      $optAttributes['class'] = $optAttributes['class'] ?? '';
       if ($required) {
-        $element->setAttribute('required', TRUE);
+        $optAttributes['class'] .= ' required';
       }
+      $element = $this->createElement('radio', NULL, NULL, $var, $key, $optAttributes);
       $options[] = $element;
     }
     $group = $this->addGroup($options, $name, $title, $separator);