Merge pull request #14895 from mattwire/optiongroup_checkcrash

Don't let optiongroup check crash
civicrm · Jul 27, 2019 · 64b5ec1 · 64b5ec1
2 parents 0d3ea1d + 8f352cb
commit 64b5ec1
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/CRM/Utils/Check/Component/OptionGroups.php b/CRM/Utils/Check/Component/OptionGroups.php
@@ -48,8 +48,10 @@ public function checkOptionGroupValues() {
         $values = CRM_Core_BAO_OptionValue::getOptionValuesArray($optionGroup['id']);
         if (count($values) > 0) {
           foreach ($values as $value) {
-            $validate = CRM_Utils_Type::validate($value['value'], $optionGroup['data_type'], FALSE);
-            if (is_null($validate)) {
+            try {
+              CRM_Utils_Type::validate($value['value'], $optionGroup['data_type'], FALSE, '', TRUE);
+            }
+            catch (Exception $e) {
               $problemValues[] = [
                 'group_name' => $optionGroup['title'],
                 'value_name' => $value['label'],