Index: branches/RC/core/kernel/utility/formatters/upload_formatter.php
===================================================================
diff -u -N -r11305 -r11361
--- branches/RC/core/kernel/utility/formatters/upload_formatter.php	(.../upload_formatter.php)	(revision 11305)
+++ branches/RC/core/kernel/utility/formatters/upload_formatter.php	(.../upload_formatter.php)	(revision 11361)
@@ -50,11 +50,8 @@
 			}
 
 			if (!$value['tmp_ids']) {
-				$uploaded_files = getArrayValue($value, 'upload');
-				if (!$uploaded_files && getArrayValue($options, 'required')) {
-					$object->SetError($field_name, 'required');
-				}
-				return $uploaded_files;
+				// no pending files -> return already uploded files
+				return getArrayValue($value, 'upload');
 			}
 			$swf_uploaded_ids = explode('|', $value['tmp_ids']);
 			$swf_uploaded_names = explode('|', $value['tmp_names']);
@@ -148,15 +145,7 @@
 				$object->SetError($field_name, 'cant_save_file', 'la_error_cant_save_file');
 			}
 		}
-		else {
-			$required_error = is_array($value) || (!is_array($value) && !$value); // input type="file" OR just setting filename (during CSV import)
 
-			if ($required_error && getArrayValue($options, 'required')) {
-				$object->SetError($field_name, 'required');
-			}
-		}
-
-		// && !$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', 'la_error_cant_save_file', $value);
 		}