Index: trunk/core/kernel/startup.php
===================================================================
diff -u -N -r2311 -r2329
--- trunk/core/kernel/startup.php	(.../startup.php)	(revision 2311)
+++ trunk/core/kernel/startup.php	(.../startup.php)	(revision 2329)
@@ -67,7 +67,7 @@
 safeDefine('IMAGES_PATH', '/kernel/images/');
 safeDefine('IMAGES_PENDING_PATH', IMAGES_PATH.'pending/');
 safeDefine('CUSTOM_UPLOAD_PATH', '/templates/images/custom/');
-safeDefine('MAX_UPLOAD_SIZE', 500000);
+safeDefine('MAX_UPLOAD_SIZE', 50000000);
 
 safeDefine('CACHE_CONFIGS_FILES', 1);
 safeDefine('EXPERIMENTAL_PRE_PARSE', 1);
Index: trunk/kernel/admin_templates/img/toolbar/tool_new_file_f2.gif
===================================================================
diff -u -N
Binary files differ
Index: trunk/kernel/admin_templates/img/toolbar/tool_primary_file.gif
===================================================================
diff -u -N
Binary files differ
Index: trunk/kernel/admin_templates/img/toolbar/tool_primary_file_f2.gif
===================================================================
diff -u -N
Binary files differ
Index: trunk/kernel/admin_templates/img/toolbar/tool_new_file.gif
===================================================================
diff -u -N
Binary files differ
Index: trunk/kernel/admin_templates/img/toolbar/tool_primary_file_f3.gif
===================================================================
diff -u -N
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_file_disabled.gif
===================================================================
diff -u -N
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_file.gif
===================================================================
diff -u -N
Binary files differ
Index: trunk/kernel/admin/include/toolbar/browse.php
===================================================================
diff -u -N -r2308 -r2329
--- trunk/kernel/admin/include/toolbar/browse.php	(.../browse.php)	(revision 2308)
+++ trunk/kernel/admin/include/toolbar/browse.php	(.../browse.php)	(revision 2329)
@@ -317,8 +317,6 @@
 	{
 		opener_action('d');
 		set_hidden_field(prefix_special+'_mode', 't');
-		set_hidden_field('remove_specials['+prefix_special+']',1);
-		
 		submit_event(prefix_special, 'OnEdit', queryTabRegistry('prefix_special', prefix_special, 'edit_template'), '../../admin/index4.php');
 	}
   
Index: trunk/core/kernel/utility/formatters.php
===================================================================
diff -u -N -r2042 -r2329
--- trunk/core/kernel/utility/formatters.php	(.../formatters.php)	(revision 2042)
+++ trunk/core/kernel/utility/formatters.php	(.../formatters.php)	(revision 2329)
@@ -556,6 +556,12 @@
 		$ret = '';
 		$options = $object->GetFieldOptions($field_name);
 		
+		if(getArrayValue($options, 'upload_dir'))
+		{
+			$this->DestinationPath = $options['upload_dir'];
+			$this->FullPath = DOC_ROOT.BASE_PATH.$this->DestinationPath;
+		}
+		
 		if (getArrayValue($value, 'upload') && getArrayValue($value, 'error') == UPLOAD_ERR_NO_FILE)
 		{
 			return getArrayValue($value, 'upload');
@@ -565,11 +571,11 @@
 		{
 			if ( is_array($value) && $value['error'] === UPLOAD_ERR_OK ) 
 			{		 		
-				if ( !in_array($value['type'], $options['allowed_types']) ) 
+				if ( getArrayValue($options, 'allowed_types') && !in_array($value['type'], $options['allowed_types']) ) 
 				{
 					$object->FieldErrors[$field_name]['pseudo'] = 'bad_file_format';
 				}
-				elseif ( $value['size'] > ($options['max_size'] ? $options['max_size'] : MAX_UPLOAD_SIZE) ) 
+				elseif ( $value['size'] > ($options['max_size'] ? $options['max_size'] : MAX_UPLOAD_SIZE) )
 				{
 					$object->FieldErrors[$field_name]['pseudo'] = 'bad_file_size';
 				}
@@ -587,7 +593,11 @@
 					}
 					else
 					{
-						$ret = $this->DestinationPath.$real_name;
+						if(getArrayValue($options, 'size_field'))
+						{
+							$object->SetDBField($options['size_field'], $value['size']);
+						}
+						$ret = getArrayValue($options, 'include_path') ? $this->DestinationPath.$real_name : $real_name;
 					}					
 				}
 			}
Index: trunk/kernel/admin_templates/img/itemicons/icon16_file_primary.gif
===================================================================
diff -u -N
Binary files differ