From 497e4c6bf4d29b222048e1a61f79213302239096 Mon Sep 17 00:00:00 2001 From: Matthew Wire Date: Tue, 29 May 2018 19:45:27 +0100 Subject: [PATCH] Fix saving option value with value=0 --- CRM/Admin/Form/Options.php | 2 +- CRM/Core/OptionValue.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Admin/Form/Options.php b/CRM/Admin/Form/Options.php index ce018dd51711..f68718d881b5 100644 --- a/CRM/Admin/Form/Options.php +++ b/CRM/Admin/Form/Options.php @@ -407,7 +407,7 @@ public static function formRule($fields, $files, $self) { $dataType = self::getOptionGroupDataType($self->_gName); if ($dataType && $self->_gName !== 'activity_type') { $validate = CRM_Utils_Type::validate($fields['value'], $dataType, FALSE); - if (!$validate) { + if ($validate === FALSE) { CRM_Core_Session::setStatus( ts('Data Type of the value field for this option value does not match ' . $dataType), ts('Value field Data Type mismatch')); diff --git a/CRM/Core/OptionValue.php b/CRM/Core/OptionValue.php index 682e9a61cc6c..f7722d85f2e9 100644 --- a/CRM/Core/OptionValue.php +++ b/CRM/Core/OptionValue.php @@ -225,7 +225,7 @@ public static function addOptionValue(&$params, &$groupParams, &$action, &$optio } $params['option_group_id'] = $optionGroupID; - if (($action & CRM_Core_Action::ADD) && empty($params['value'])) { + if (($action & CRM_Core_Action::ADD) && !isset($params['value'])) { $fieldValues = array('option_group_id' => $optionGroupID); // use the next available value /* CONVERT(value, DECIMAL) is used to convert varchar