Index: trunk/core/kernel/utility/formatters/upload_formatter.php =================================================================== diff -u -N -r8693 -r8842 --- trunk/core/kernel/utility/formatters/upload_formatter.php (.../upload_formatter.php) (revision 8693) +++ trunk/core/kernel/utility/formatters/upload_formatter.php (.../upload_formatter.php) (revision 8842) @@ -16,12 +16,12 @@ /** - * Enter description here... + * Processes file uploads from form * * @param mixed $value * @param string $field_name * @param kDBItem $object - * @return unknown + * @return string */ function Parse($value, $field_name, &$object) { @@ -89,19 +89,19 @@ $max_filesize = isset($options['max_size']) ? $options['max_size'] : MAX_UPLOAD_SIZE; if (getArrayValue($options, 'allowed_types') && !in_array($value['type'], $options['allowed_types'])) { - $object->FieldErrors[$field_name]['pseudo'] = 'bad_file_format'; + $object->SetError($field_name, 'bad_file_format'); } elseif ($value['size'] > $max_filesize) { - $object->FieldErrors[$field_name]['pseudo'] = 'bad_file_size'; + $object->SetError($field_name, 'bad_file_size'); } elseif (!is_writable($this->FullPath)) { - $object->FieldErrors[$field_name]['pseudo'] = 'cant_save_file'; + $object->SetError($field_name, 'cant_save_file'); } else { $real_name = $this->ValidateFileName($this->FullPath, $value['name']); $file_name = $this->FullPath.$real_name; if (!move_uploaded_file($value['tmp_name'], $file_name)) { - $object->FieldErrors[$field_name]['pseudo'] = 'cant_save_file'; + $object->SetError($field_name, 'cant_save_file'); } else { @chmod($file_name, 0666); @@ -125,17 +125,18 @@ } } else { - $object->FieldErrors[$field_name]['pseudo'] = 'cant_save_file'; + $object->SetError($field_name, 'cant_save_file'); } } else { if (getArrayValue($options, 'required')) { - $object->FieldErrors[$field_name]['pseudo'] = 'required'; + $object->SetError($field_name, 'required'); } } - if ((count($value) > 1) && $value['error'] && ($value['error'] != UPLOAD_ERR_NO_FILE) && !$object->FieldErrors[$field_name]['pseudo']) { - $object->FieldErrors[$field_name]['pseudo'] = 'cant_save_file'; + // && !$object->FieldErrors[$field_name]['pseudo'] - already implemented in kDBItem::SetError method + if ((count($value) > 1) && $value['error'] && ($value['error'] != UPLOAD_ERR_NO_FILE)) { + $object->SetError($field_name, 'cant_save_file'); } return $ret;