Fix saving option value with value=0

civicrm · May 29, 2018 · 497e4c6 · 497e4c6
1 parent 0b0f516
commit 497e4c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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