Index: trunk/core/units/general/brackets.php =================================================================== diff -u -N -r3094 -r3097 --- trunk/core/units/general/brackets.php (.../brackets.php) (revision 3094) +++ trunk/core/units/general/brackets.php (.../brackets.php) (revision 3097) @@ -90,11 +90,17 @@ { $object =& $event->getObject(); $infinite_exists = $this->Conn->GetOne('SELECT COUNT(*) FROM '.$object->TableName.' WHERE '.$this->max_field.' = -1'); - + $field_values = $this->Application->GetVar( $event->getPrefixSpecial(true) ); + /*if(is_array($field_values)) + { + foreach($field_values as $values) + { + $infinite_exists = $infinite_exists || ($values[$this->max_field] == -1); + } + }*/ + if($infinite_exists == 0) { - $field_values = $this->Application->GetVar( $event->getPrefixSpecial(true) ); - reset($field_values); $last_bracket = end($field_values); $new_id = (int)$this->Conn->GetOne('SELECT MIN('.$object->IDField.') FROM '.$object->TableName); @@ -218,10 +224,10 @@ // Max already defined in $end_values (array_search($record[$this->max_field], $end_values) !== false) ) { // then delete from brackets list - unset($temp[$id]); + unset($temp[$id]); } else { // this is when ok - add to end_values list - $end_values[] = $record[$this->max_field]; + $end_values[] = $record[$this->max_field]; } } @@ -335,7 +341,7 @@ function replaceInfinity(&$event) { $object =& $event->getObject(); - if($object->GetDBField($this->max_field) == '∞') $bracket->SetDBField($this->max_field, -1); + if($object->GetDBField($this->max_field) == '∞') $object->SetDBField($this->max_field, -1); } } Index: trunk/kernel/units/general/brackets.php =================================================================== diff -u -N -r3094 -r3097 --- trunk/kernel/units/general/brackets.php (.../brackets.php) (revision 3094) +++ trunk/kernel/units/general/brackets.php (.../brackets.php) (revision 3097) @@ -90,11 +90,17 @@ { $object =& $event->getObject(); $infinite_exists = $this->Conn->GetOne('SELECT COUNT(*) FROM '.$object->TableName.' WHERE '.$this->max_field.' = -1'); - + $field_values = $this->Application->GetVar( $event->getPrefixSpecial(true) ); + /*if(is_array($field_values)) + { + foreach($field_values as $values) + { + $infinite_exists = $infinite_exists || ($values[$this->max_field] == -1); + } + }*/ + if($infinite_exists == 0) { - $field_values = $this->Application->GetVar( $event->getPrefixSpecial(true) ); - reset($field_values); $last_bracket = end($field_values); $new_id = (int)$this->Conn->GetOne('SELECT MIN('.$object->IDField.') FROM '.$object->TableName); @@ -218,10 +224,10 @@ // Max already defined in $end_values (array_search($record[$this->max_field], $end_values) !== false) ) { // then delete from brackets list - unset($temp[$id]); + unset($temp[$id]); } else { // this is when ok - add to end_values list - $end_values[] = $record[$this->max_field]; + $end_values[] = $record[$this->max_field]; } } @@ -335,7 +341,7 @@ function replaceInfinity(&$event) { $object =& $event->getObject(); - if($object->GetDBField($this->max_field) == '∞') $bracket->SetDBField($this->max_field, -1); + if($object->GetDBField($this->max_field) == '∞') $object->SetDBField($this->max_field, -1); } } Index: trunk/core/kernel/utility/formatters.php =================================================================== diff -u -N -r3054 -r3097 --- trunk/core/kernel/utility/formatters.php (.../formatters.php) (revision 3054) +++ trunk/core/kernel/utility/formatters.php (.../formatters.php) (revision 3097) @@ -950,8 +950,8 @@ { $regional =& $this->Application->recallObject('lang.current'); $add_fields = Array(); - $options_a = Array('type' => 'int','error_field' => $field_name,'master_field' => $field_name,'format' => '%d','min_value_inc' => 0 ); - $options_b = Array('type' => 'double','error_field' => $field_name,'master_field' => $field_name,'format' => '%0.1f','min_value_inc' => 0); + $options_a = Array('type' => 'int','error_field' => $field_name,'master_field' => $field_name,'format' => '%d' ); + $options_b = Array('type' => 'double','error_field' => $field_name,'master_field' => $field_name,'format' => '%0.1f' ); switch( $regional->GetDBField('UnitSystem') ) { case 2: // US/UK