From: Matthew Wire (MJW Consulting) <mjw@mjwconsult.co.uk>
Date: Sat, 27 Jul 2019 19:49:38 +0000 (+0100)
Subject: Don't let optiongroup check crash
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8f352cb618dceb20e8a8fb83667cc6f5b153e420;p=civicrm-core.git

Don't let optiongroup check crash
---

diff --git a/CRM/Utils/Check/Component/OptionGroups.php b/CRM/Utils/Check/Component/OptionGroups.php
index dda6660290..33abe22786 100644
--- a/CRM/Utils/Check/Component/OptionGroups.php
+++ b/CRM/Utils/Check/Component/OptionGroups.php
@@ -48,8 +48,10 @@ class CRM_Utils_Check_Component_OptionGroups extends CRM_Utils_Check_Component {
         $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'],