Index: branches/unlabeled/unlabeled-1.42.10/core/kernel/db/db_tag_processor.php =================================================================== diff -u -r3688 -r3962 --- branches/unlabeled/unlabeled-1.42.10/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 3688) +++ branches/unlabeled/unlabeled-1.42.10/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 3962) @@ -704,6 +704,8 @@ $options = $object->GetFieldOptions($field); + $format = $options[ $this->SelectParam($params, 'input_format') ? 'input_format' : 'format' ]; + $formatter_class = getArrayValue($options,'formatter'); if($formatter_class) { @@ -717,12 +719,12 @@ } elseif($human_format || $edit_size) { - $format = $formatter->HumanFormat($options['format']); + $format = $formatter->HumanFormat($format); return $edit_size ? strlen($format) : $format; } } - return $options['format']; + return $format; } /** @@ -1387,6 +1389,8 @@ $options = $object->GetFieldOptions($field); + $format = $options[ $this->SelectParam($params, 'input_format') ? 'input_format' : 'format' ]; + $formatter_class = getArrayValue($options,'formatter'); if($formatter_class) { @@ -1400,12 +1404,12 @@ } elseif($human_format || $edit_size) { - $format = $formatter->HumanFormat($options['format']); + $format = $formatter->HumanFormat($format); return $edit_size ? strlen($format) : $format; } } - return $options['format']; + return $format; } /** @@ -1418,13 +1422,17 @@ { $field = $this->SelectParam($params, 'field,name'); + + $error_var_name = $this->getPrefixSpecial().'_'.$field.'_'.$params['type'].'_error'; $error_msg = $this->Application->RecallVar($error_var_name); if($error_msg) { $this->Application->StoreVar($error_var_name, ''); } - return $error_msg; + + $object =& $this->Application->recallObject($this->Prefix.'.'.$this->Special.'-item', null, Array('skip_autoload' => true)); + return $object->ErrorMsgs[$error_msg]; } /**