Index: trunk/core/kernel/utility/formatters.php
===================================================================
diff -u -r2336 -r2348
--- trunk/core/kernel/utility/formatters.php	(.../formatters.php)	(revision 2336)
+++ trunk/core/kernel/utility/formatters.php	(.../formatters.php)	(revision 2348)
@@ -601,8 +601,8 @@
 						{
 							$object->SetDBField($options['orig_name_field'], $value['name']);
 						}
-						$ret = getArrayValue($options, 'upload_path') ? $real_name : $this->DestinationPath.$real_name;
-					}					
+						$ret = getArrayValue($options, 'upload_dir') ? $real_name : $this->DestinationPath.$real_name;
+					}
 				}
 			}
 			else
@@ -622,8 +622,8 @@
 	function ValidateFileName($path, $name)
 	{
 		$parts = pathinfo($name);
-	  $ext = '.'.$parts['extension'];
-	  $filename = substr($parts['basename'], 0, -strlen($ext));
+		$ext = '.'.$parts['extension'];
+		$filename = substr($parts['basename'], 0, -strlen($ext));
 		$new_name = $filename.$ext;
 		while ( file_exists($path.'/'.$new_name) ) 
 		{