- if (!isset($defaults['weight']) || !$defaults['weight']) {
- $fieldValues = array('option_group_id' => $this->_gid);
- $defaults['weight'] = CRM_Utils_Weight::getDefaultWeight('CRM_Core_DAO_OptionValue', $fieldValues);
+ // Default weight & value
+ $fieldValues = array('option_group_id' => $this->_gid);
+ foreach (array('weight', 'value') as $field) {
+ if (empty($defaults[$field])) {
+ $defaults[$field] = CRM_Utils_Weight::getDefaultWeight('CRM_Core_DAO_OptionValue', $fieldValues, $field);
+ }