Fix saving option value with value=0

diff --git a/CRM/Admin/Form/Options.php b/CRM/Admin/Form/Options.php
index ce018dd51711caa7158f33790b1bb23bfa53ad60..f68718d881b5886a5e55b02c36c8232390f1170e 100644 (file)
--- a/CRM/Admin/Form/Options.php
+++ b/CRM/Admin/Form/Options.php
@@ -407,7 +407,7 @@ class CRM_Admin_Form_Options extends CRM_Admin_Form {
     $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 4a9885f9c9768112f136f0d68d17829fc92e92eb..27a1a756f07ecc39e6806aafc53bdd793a6592bb 100644 (file)
--- a/CRM/Core/OptionValue.php
+++ b/CRM/Core/OptionValue.php
@@ -224,7 +224,7 @@ class CRM_Core_OptionValue {
     }
     $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